X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fpuppet-steps.j2;h=5567d65d8c975fc4a462e8ed4e644d98cefdc99f;hb=11a97ec7430118bbf4a11c87eceb3adec40ea4ac;hp=782a32c9e6e0f1afc40d09053534a869846523aa;hpb=ae6883323eaed0a925b128dc53301bfa5995f41d;p=apex-tripleo-heat-templates.git

diff --git a/puppet/puppet-steps.j2 b/puppet/puppet-steps.j2
index 782a32c9..5567d65d 100644
--- a/puppet/puppet-steps.j2
+++ b/puppet/puppet-steps.j2
@@ -23,19 +23,12 @@
     properties:
       StepConfig: {list_join: ["\n", {get_param: [role_data, {{role.name}}, step_config]}]}
 
-  {{role.name}}PrePuppet:
-    type: OS::TripleO::Tasks::{{role.name}}PrePuppet
-    properties:
-      servers: {get_param: [servers, {{role.name}}]}
-      input_values:
-        update_identifier: {get_param: DeployIdentifier}
-
   # Step through a series of configuration steps
 {% for step in range(1, 6) %}
   {{role.name}}Deployment_Step{{step}}:
     type: OS::Heat::StructuredDeploymentGroup
   {% if step == 1 %}
-    depends_on: [{{role.name}}PrePuppet, {{role.name}}PreConfig, {{role.name}}ArtifactsDeploy]
+    depends_on: [{{role.name}}PreConfig, {{role.name}}ArtifactsDeploy]
   {% else %}
     depends_on:
     {% for dep in roles %}
@@ -51,34 +44,31 @@
         update_identifier: {get_param: DeployIdentifier}
 {% endfor %}
 
-  {{role.name}}PostConfig:
-    type: OS::TripleO::Tasks::{{role.name}}PostConfig
-    depends_on:
-  {% for dep in roles %}
-      - {{dep.name}}Deployment_Step5
-  {% endfor %}
-    properties:
-      servers:  {get_param: servers}
-      input_values:
-        update_identifier: {get_param: DeployIdentifier}
-
-  # Note, this should come last, so use depends_on to ensure
-  # this is created after any other resources.
+  # Note, this should be the last step to execute configuration changes.
+  # Ensure that all {{role.name}}ExtraConfigPost steps are executed
+  # after all the previous deployment steps.
   {{role.name}}ExtraConfigPost:
     depends_on:
   {% for dep in roles %}
-      - {{dep.name}}PostConfig
+      - {{dep.name}}Deployment_Step5
   {% endfor %}
     type: OS::TripleO::NodeExtraConfigPost
     properties:
         servers: {get_param: [servers, {{role.name}}]}
 
-  {{role.name}}PostPuppet:
+  # The {{role.name}}PostConfig steps are in charge of
+  # quiescing all services, i.e. in the Controller case,
+  # we should run a full service reload.
+  {{role.name}}PostConfig:
+    type: OS::TripleO::Tasks::{{role.name}}PostConfig
     depends_on:
-      - {{role.name}}ExtraConfigPost
-    type: OS::TripleO::Tasks::{{role.name}}PostPuppet
+  {% for dep in roles %}
+      - {{dep.name}}ExtraConfigPost
+  {% endfor %}
     properties:
-      servers: {get_param: [servers, {{role.name}}]}
+      servers: {get_param: servers}
       input_values:
         update_identifier: {get_param: DeployIdentifier}
+
+
 {% endfor %}