openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Disable env evaluation in workflow executions"

This commit is contained in:
Jenkins 2017-07-22 08:18:14 +00:00 committed by Gerrit Code Review
parent bb963cfe42 501f35a34e
commit 5495b89f5f
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/docker-steps.j2
View File

@ -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 %}

2
puppet/puppet-steps.j2
View File

@ -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