Merge "Use j2 loops in post.j2.yaml"

puppet/post.j2.yaml

@@ -57,72 +57,29 @@ resources:
   {% endif %}
 
   # Step through a series of configuration steps
-  {{role.name}}Deployment_Step1:
+{% for step in range(1, 6) %}
+  {% for role in roles %}
+
+  {{role.name}}Deployment_Step{{step}}:
     type: OS::Heat::StructuredDeploymentGroup
+  {% if step == 1 %}
     depends_on: [{{role.name}}PreConfig, {{role.name}}ArtifactsDeploy]
-    properties:
+  {% else %}
-      name: {{role.name}}Deployment_Step1
-      servers: {get_param: [servers, {{role.name}}]}
-      config: {get_resource: {{role.name}}Config}
-      input_values:
-        step: 1
-        update_identifier: {get_param: DeployIdentifier}
-
-  {{role.name}}Deployment_Step2:
-    type: OS::Heat::StructuredDeploymentGroup
     depends_on:
     {% for dep in roles %}
-      - {{dep.name}}Deployment_Step1
+      - {{dep.name}}Deployment_Step{{step -1}}
     {% endfor %}
+  {% endif %}
     properties:
-      name: {{role.name}}Deployment_Step2
+      name: {{role.name}}Deployment_Step{{step}}
       servers: {get_param: [servers, {{role.name}}]}
       config: {get_resource: {{role.name}}Config}
       input_values:
-        step: 2
+        step: {{step}}
         update_identifier: {get_param: DeployIdentifier}
 
-  {{role.name}}Deployment_Step3:
-    type: OS::Heat::StructuredDeploymentGroup
-    depends_on:
-  {% for dep in roles %}
-      - {{dep.name}}Deployment_Step2
   {% endfor %}
-    properties:
+{% endfor %}
-      name: {{role.name}}Deployment_Step3
-      servers: {get_param: [servers, {{role.name}}]}
-      config: {get_resource: {{role.name}}Config}
-      input_values:
-        step: 3
-        update_identifier: {get_param: DeployIdentifier}
-
-  {{role.name}}Deployment_Step4:
-    type: OS::Heat::StructuredDeploymentGroup
-    depends_on:
-  {% for dep in roles %}
-      - {{dep.name}}Deployment_Step3
-  {% endfor %}
-    properties:
-      name: {{role.name}}Deployment_Step4
-      servers: {get_param: [servers, {{role.name}}]}
-      config: {get_resource: {{role.name}}Config}
-      input_values:
-        step: 4
-        update_identifier: {get_param: DeployIdentifier}
-
-  {{role.name}}Deployment_Step5:
-    type: OS::Heat::StructuredDeploymentGroup
-    depends_on:
-  {% for dep in roles %}
-      - {{dep.name}}Deployment_Step4
-  {% endfor %}
-    properties:
-      name: {{role.name}}Deployment_Step5
-      servers: {get_param: [servers, {{role.name}}]}
-      config: {get_resource: {{role.name}}Config}
-      input_values:
-        step: 5
-        update_identifier: {get_param: DeployIdentifier}
 
   {{role.name}}PostConfig:
     type: OS::TripleO::Tasks::{{role.name}}PostConfig