X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fcontroller-post.yaml;h=4af6cb4696e00f1384ed8767ce4c81ac34d3a061;hb=c89097c20220bc2266872d7bb01cce28fa01793b;hp=713ad70650eb0474ee8219d6e90b67882d524a03;hpb=424df742367103271ee2f7d6fe4936bdf3b99827;p=apex-tripleo-heat-templates.git

diff --git a/puppet/controller-post.yaml b/puppet/controller-post.yaml
index 713ad706..4af6cb46 100644
--- a/puppet/controller-post.yaml
+++ b/puppet/controller-post.yaml
@@ -10,11 +10,13 @@ parameters:
     type: boolean
   servers:
     type: json
-  NodeConfigIdentifiers:
-     type: json
+  RoleData:
+    type: json
+    default: {}
+  DeployIdentifier:
+     type: string
      description: Value which changes if the node configuration may need to be re-applied
 
-
 resources:
 
   ControllerArtifactsConfig:
@@ -31,10 +33,12 @@ resources:
     properties:
       servers:  {get_param: servers}
       input_values:
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   ControllerPuppetConfig:
     type: OS::TripleO::ControllerConfig
+    properties:
+      StepConfig: {get_param: [RoleData, step_config]}
 
   # Step through a series of Puppet runs using the same manifest.
   # NOTE: To enable stepping through the deployments via heat hooks,
@@ -49,8 +53,7 @@ resources:
       config: {get_resource: ControllerPuppetConfig}
       input_values:
         step: 1
-        update_identifier: {get_param: NodeConfigIdentifiers}
-      actions: ['CREATE'] # no need for two passes on an UPDATE
+        update_identifier: {get_param: DeployIdentifier}
 
   ControllerServicesBaseDeployment_Step2:
     type: OS::Heat::StructuredDeployments
@@ -61,43 +64,29 @@ resources:
       config: {get_resource: ControllerPuppetConfig}
       input_values:
         step: 2
-        update_identifier: {get_param: NodeConfigIdentifiers}
-      actions: ['CREATE'] # no need for two passes on an UPDATE
-
-  ControllerRingbuilderPuppetConfig:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: puppet
-      options:
-        enable_debug: {get_param: ConfigDebug}
-        enable_hiera: True
-        enable_facter: False
-      inputs:
-      outputs:
-      - name: result
-      config:
-        get_file: manifests/ringbuilder.pp
+        update_identifier: {get_param: DeployIdentifier}
 
-  ControllerRingbuilderDeployment_Step3:
+  ControllerOvercloudServicesDeployment_Step3:
     type: OS::Heat::StructuredDeployments
     depends_on: ControllerServicesBaseDeployment_Step2
     properties:
-      name: ControllerRingbuilderDeployment_Step3
+      name: ControllerOvercloudServicesDeployment_Step3
       servers:  {get_param: servers}
-      config: {get_resource: ControllerRingbuilderPuppetConfig}
+      config: {get_resource: ControllerPuppetConfig}
       input_values:
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        step: 3
+        update_identifier: {get_param: DeployIdentifier}
 
   ControllerOvercloudServicesDeployment_Step4:
     type: OS::Heat::StructuredDeployments
-    depends_on: ControllerRingbuilderDeployment_Step3
+    depends_on: ControllerOvercloudServicesDeployment_Step3
     properties:
       name: ControllerOvercloudServicesDeployment_Step4
       servers:  {get_param: servers}
       config: {get_resource: ControllerPuppetConfig}
       input_values:
-        step: 3
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        step: 4
+        update_identifier: {get_param: DeployIdentifier}
 
   ControllerOvercloudServicesDeployment_Step5:
     type: OS::Heat::StructuredDeployments
@@ -106,28 +95,17 @@ resources:
       name: ControllerOvercloudServicesDeployment_Step5
       servers:  {get_param: servers}
       config: {get_resource: ControllerPuppetConfig}
-      input_values:
-        step: 4
-        update_identifier: {get_param: NodeConfigIdentifiers}
-
-  ControllerOvercloudServicesDeployment_Step6:
-    type: OS::Heat::StructuredDeployments
-    depends_on: ControllerOvercloudServicesDeployment_Step5
-    properties:
-      name: ControllerOvercloudServicesDeployment_Step6
-      servers:  {get_param: servers}
-      config: {get_resource: ControllerPuppetConfig}
       input_values:
         step: 5
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   ControllerPostPuppet:
     type: OS::TripleO::Tasks::ControllerPostPuppet
-    depends_on: ControllerOvercloudServicesDeployment_Step6
+    depends_on: ControllerOvercloudServicesDeployment_Step5
     properties:
       servers:  {get_param: servers}
       input_values:
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   # Note, this should come last, so use depends_on to ensure
   # this is created after any other resources.