From 501f35a34e09d1e84131b9859758a78071513c52 Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Thu, 20 Jul 2017 13:44:57 +0200 Subject: Disable env evaluation in workflow executions This is so that Mistral does not try to resolve the occurrences of {{ or <% as jinja/jaql in the environment data. Change-Id: Id654c336d072a6248570274401857756c6f6e706 --- docker/docker-steps.j2 | 2 ++ puppet/puppet-steps.j2 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/docker/docker-steps.j2 b/docker/docker-steps.j2 index 4b0c8789..7c4d4291 100644 --- a/docker/docker-steps.j2 +++ b/docker/docker-steps.j2 @@ -133,6 +133,7 @@ resources: {%- for r in roles %} {{r.name}}: {get_param: [role_data, {{r.name}}, merged_config_settings]} {%- endfor %} + evaluate_env: false UPDATE: workflow: { get_resource: WorkflowTasks_Step{{step}} } params: @@ -142,6 +143,7 @@ resources: {%- for r in roles %} {{r.name}}: {get_param: [role_data, {{r.name}}, merged_config_settings]} {%- endfor %} + evaluate_env: false always_update: true # END service_workflow_tasks handling {% endfor %} diff --git a/puppet/puppet-steps.j2 b/puppet/puppet-steps.j2 index 3d071018..114b056e 100644 --- a/puppet/puppet-steps.j2 +++ b/puppet/puppet-steps.j2 @@ -139,6 +139,7 @@ resources: {%- for r in roles %} {{r.name}}: {get_param: [role_data, {{r.name}}, merged_config_settings]} {%- endfor %} + evaluate_env: false UPDATE: workflow: { get_resource: WorkflowTasks_Step{{step}} } params: @@ -148,6 +149,7 @@ resources: {%- for r in roles %} {{r.name}}: {get_param: [role_data, {{r.name}}, merged_config_settings]} {%- endfor %} + evaluate_env: false always_update: true {% endfor %} # END service_workflow_tasks handling -- cgit 1.2.3-korg