X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fdocker-steps.j2;h=d380191dffbd5f72093feee7f5f31193bc6d43f4;hb=ede56b7a8e2db78513b64996b0a0f5a1ce1904db;hp=643727db4cf9b09d6f9cadb3d32e79509811715d;hpb=085d5009b6b56245b46ecb935a72d86402791c89;p=apex-tripleo-heat-templates.git

diff --git a/docker/docker-steps.j2 b/docker/docker-steps.j2
index 643727db..d380191d 100644
--- a/docker/docker-steps.j2
+++ b/docker/docker-steps.j2
@@ -11,7 +11,7 @@
 # primary role is: {{primary_role_name}}
 {% set deploy_steps_max = 6 -%}
 
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   Post-deploy configuration steps via puppet for all roles,
@@ -256,14 +256,12 @@ resources:
 
   # BEGIN BAREMETAL CONFIG STEPS
 
-  {% if role.name == 'Controller' %}
-  ControllerPrePuppet:
-    type: OS::TripleO::Tasks::ControllerPrePuppet
+  {{role.name}}PreConfig:
+    type: OS::TripleO::Tasks::{{role.name}}PreConfig
     properties:
-      servers: {get_param: [servers, Controller]}
+      servers: {get_param: [servers, {{role.name}}]}
       input_values:
         update_identifier: {get_param: DeployIdentifier}
-  {% endif %}
 
   {{role.name}}Config:
     type: OS::TripleO::{{role.name}}Config
@@ -309,10 +307,12 @@ resources:
     type: OS::Heat::StructuredDeploymentGroup
   {% if step == 1 %}
     depends_on:
-      - {{role.name}}PreConfig
       - {{role.name}}KollaJsonDeployment
       - {{role.name}}GenPuppetDeployment
       - {{role.name}}GenerateConfigDeployment
+        {%- for dep in roles %}
+      - {{dep.name}}Deployment_Step{{step}} # baremetal steps of the same level run first
+        {%- endfor %}
   {% else %}
     depends_on:
         {% for dep in roles %}
@@ -353,15 +353,4 @@ resources:
     properties:
         servers: {get_param: [servers, {{role.name}}]}
 
-  {% if role.name == 'Controller' %}
-  ControllerPostPuppet:
-    depends_on:
-      - ControllerExtraConfigPost
-    type: OS::TripleO::Tasks::ControllerPostPuppet
-    properties:
-      servers: {get_param: [servers, Controller]}
-      input_values:
-        update_identifier: {get_param: DeployIdentifier}
-  {% endif %}
-
 {% endfor %}