Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Disable env evaluation in workflow executions"
[apex-tripleo-heat-templates.git]
/
puppet
/
puppet-steps.j2
diff --git
a/puppet/puppet-steps.j2
b/puppet/puppet-steps.j2
index
37bc000
..
542af42
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 %}
{%- 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:
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 %}
{%- 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
always_update: true
{% endfor %}
# END service_workflow_tasks handling