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

diff --git a/docker/docker-steps.j2 b/docker/docker-steps.j2
index 4b0c878..7c4d429 100644 (file)
--- 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 3d07101..114b056 100644 (file)
--- 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