diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-22 08:18:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-22 08:18:14 +0000 |
| commit | 5495b89f5fb8ce0e831955470ef58f52044b82f4 (patch) | |
| tree | f8c419da00b72083cb9155fb9aea673583263e06 | |
| parent | bb963cfe422d1ad4de2fa5b7cf24fa3907582ad9 (diff) | |
| parent | 501f35a34e09d1e84131b9859758a78071513c52 (diff) | |
Merge "Disable env evaluation in workflow executions"
| -rw-r--r-- | docker/docker-steps.j2 | 2 | ||||
| -rw-r--r-- | puppet/puppet-steps.j2 | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/docker/docker-steps.j2 b/docker/docker-steps.j2 index 316b46bb..68ab02fe 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 37bc0002..542af42c 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 |