Merge "Add environment for deployed-server with pacemaker" into stable/ocata

[apex-tripleo-heat-templates.git] / puppet / puppet-steps.j2

diff --git a/puppet/puppet-steps.j2 b/puppet/puppet-steps.j2
index 4eca233..cfa70f7 100644 (file)
--- a/puppet/puppet-steps.j2
+++ b/puppet/puppet-steps.j2
@@ -43,7 +43,9 @@
 {% for step in range(1, 6) %}
   {{role.name}}Deployment_Step{{step}}:
     type: OS::Heat::StructuredDeploymentGroup
-  {% if step == 1 %}
+  {% if step == 1 and role.name == 'Controller' %}
+    depends_on: [ControllerPrePuppet, {{role.name}}PreConfig, {{role.name}}ArtifactsDeploy]
+  {% elif step == 1 and role.name != 'Controller' %}
     depends_on: [{{role.name}}PreConfig, {{role.name}}ArtifactsDeploy]
   {% else %}
     depends_on: