Merge "First iteration of libvirt and nova-compute as a composable services"

[apex-tripleo-heat-templates.git] / puppet / controller-post.yaml

diff --git a/puppet/controller-post.yaml b/puppet/controller-post.yaml
index 80b08a0..27fbdec 100644 (file)
--- a/puppet/controller-post.yaml
+++ b/puppet/controller-post.yaml
@@ -11,12 +11,11 @@ parameters:
   servers:
     type: json
   NodeConfigIdentifiers:
-     type: json
-     description: Value which changes if the node configuration may need to be re-applied
-  StepConfig:
-     type: string
-     description: Config manifests that will be used to step through the deployment.
-     default: ''
+    type: json
+    description: Value which changes if the node configuration may need to be re-applied
+  RoleData:
+    type: json
+    default: {}
 
 resources:
 
@@ -39,7 +38,7 @@ resources:
   ControllerPuppetConfig:
     type: OS::TripleO::ControllerConfig
     properties:
-      StepConfig: {get_param: StepConfig}
+      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,
@@ -55,7 +54,6 @@ resources:
       input_values:
         step: 1
         update_identifier: {get_param: NodeConfigIdentifiers}
-      actions: ['CREATE'] # no need for two passes on an UPDATE
 
   ControllerServicesBaseDeployment_Step2:
     type: OS::Heat::StructuredDeployments
@@ -67,7 +65,6 @@ resources:
       input_values:
         step: 2
         update_identifier: {get_param: NodeConfigIdentifiers}
-      actions: ['CREATE'] # no need for two passes on an UPDATE
 
   ControllerOvercloudServicesDeployment_Step3:
     type: OS::Heat::StructuredDeployments
@@ -102,31 +99,9 @@ resources:
         step: 5
         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: 6
-        update_identifier: {get_param: NodeConfigIdentifiers}
-
-  ControllerOvercloudServicesDeployment_Step7:
-    type: OS::Heat::StructuredDeployments
-    depends_on: ControllerOvercloudServicesDeployment_Step6
-    properties:
-      name: ControllerOvercloudServicesDeployment_Step7
-      servers:  {get_param: servers}
-      config: {get_resource: ControllerPuppetConfig}
-      input_values:
-        step: 7
-        update_identifier: {get_param: NodeConfigIdentifiers}
-
   ControllerPostPuppet:
     type: OS::TripleO::Tasks::ControllerPostPuppet
-    depends_on: ControllerOvercloudServicesDeployment_Step7
+    depends_on: ControllerOvercloudServicesDeployment_Step5
     properties:
       servers:  {get_param: servers}
       input_values: