X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fpuppet-steps.j2;h=53ffe7a95862249afe250f1d09538bcd533b768a;hb=ba1dfb216907384ef13b826124b9ff0387a9aefe;hp=c3b54ccd4ecb0976f55730a67c7823bddb74a38b;hpb=854b5120cc04418b34e45a523d0ea67ae64a448e;p=apex-tripleo-heat-templates.git

diff --git a/puppet/puppet-steps.j2 b/puppet/puppet-steps.j2
index c3b54ccd..53ffe7a9 100644
--- a/puppet/puppet-steps.j2
+++ b/puppet/puppet-steps.j2
@@ -23,15 +23,6 @@
     properties:
       StepConfig: {get_param: [role_data, {{role.name}}, step_config]}
 
-  {% if role.name == 'Controller' %}
-  ControllerPrePuppet:
-    type: OS::TripleO::Tasks::ControllerPrePuppet
-    properties:
-      servers: {get_param: [servers, Controller]}
-      input_values:
-        update_identifier: {get_param: DeployIdentifier}
-  {% endif %}
-
   # Step through a series of configuration steps
 {% for step in range(1, 6) %}
   {{role.name}}Deployment_Step{{step}}:
@@ -60,7 +51,7 @@
       - {{dep.name}}Deployment_Step5
   {% endfor %}
     properties:
-      servers:  {get_param: servers}
+      servers: {get_param: servers}
       input_values:
         update_identifier: {get_param: DeployIdentifier}
 
@@ -75,14 +66,4 @@
     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 %}