summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2017-07-20 13:44:57 +0200
committerGiulio Fidente <gfidente@redhat.com>2017-07-20 13:44:57 +0200
commit501f35a34e09d1e84131b9859758a78071513c52 (patch)
treea2794fb4f3affddb7d4e32a1749d9920f50e5bb9
parent7e4f7dd2b0324247bba8fd8da5f3becd20e8299f (diff)
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
-rw-r--r--docker/docker-steps.j22
-rw-r--r--puppet/puppet-steps.j22
2 files changed, 4 insertions, 0 deletions
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