openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove spurious for loop from post deploy j2"

Browse Source
This commit is contained in:
Jenkins
2017-01-25 03:36:35 +00:00
committed by Gerrit Code Review
parent a2aacec531 d33422d635
commit 7307d43f1a
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
puppet/post.j2.yaml
View File

@@ -21,11 +21,10 @@ parameters:
perform configuration on a Heat stack-update. perform configuration on a Heat stack-update.
resources: resources:
{% for role in roles %}
# Post deployment steps for all roles # Post deployment steps for all roles
# A single config is re-applied with an incrementing step number # A single config is re-applied with an incrementing step number
# {{role.name}} Role steps {% for role in roles %}
# {{role.name}} Role post deploy steps
{{role.name}}ArtifactsConfig: {{role.name}}ArtifactsConfig:
type: deploy-artifacts.yaml type: deploy-artifacts.yaml
@@ -58,8 +57,6 @@ resources:
# Step through a series of configuration steps # Step through a series of configuration steps
{% for step in range(1, 6) %} {% for step in range(1, 6) %}
{% for role in roles %}
{{role.name}}Deployment_Step{{step}}: {{role.name}}Deployment_Step{{step}}:
type: OS::Heat::StructuredDeploymentGroup type: OS::Heat::StructuredDeploymentGroup
{% if step == 1 %} {% if step == 1 %}
@@ -77,8 +74,6 @@ resources:
input_values: input_values:
step: {{step}} step: {{step}}
update_identifier: {get_param: DeployIdentifier} update_identifier: {get_param: DeployIdentifier}
{% endfor %}
{% endfor %} {% endfor %}
{{role.name}}PostConfig: {{role.name}}PostConfig: