X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fcompute-post.yaml;h=698cadbac94f0a8920e914f50ea6f9912a306048;hb=a47d580018625d1b6363228f4254ded317c2091e;hp=3861e50cfb8dac5ad23ce28fdaf0c580e7b04663;hpb=566410cea8ea0cf96fc38287bf2fa581b06f66b2;p=apex-tripleo-heat-templates.git

diff --git a/puppet/compute-post.yaml b/puppet/compute-post.yaml
index 3861e50c..698cadba 100644
--- a/puppet/compute-post.yaml
+++ b/puppet/compute-post.yaml
@@ -13,34 +13,79 @@ parameters:
   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: ''
 
 resources:
 
+  ComputeArtifactsConfig:
+    type: deploy-artifacts.yaml
+
+  ComputeArtifactsDeploy:
+    type: OS::Heat::StructuredDeployments
+    properties:
+      servers:  {get_param: servers}
+      config: {get_resource: ComputeArtifactsConfig}
+      input_values:
+        update_identifier: {get_param: NodeConfigIdentifiers}
+
   ComputePuppetConfig:
     type: OS::Heat::SoftwareConfig
     properties:
       group: puppet
       options:
         enable_debug: {get_param: ConfigDebug}
+        enable_hiera: True
+        enable_facter: False
+      inputs:
+      - name: step
       outputs:
       - name: result
       config:
-        get_file: manifests/overcloud_compute.pp
+        list_join:
+        - ''
+        - - get_file: manifests/overcloud_compute.pp
+          - {get_param: StepConfig}
+
+  ComputeServicesBaseDeployment_Step2:
+    type: OS::Heat::StructuredDeployments
+    depends_on: [ComputeArtifactsDeploy]
+    properties:
+      name: ComputeServicesBaseDeployment_Step2
+      servers:  {get_param: servers}
+      config: {get_resource: ComputePuppetConfig}
+      input_values:
+        step: 2
+        update_identifier: {get_param: NodeConfigIdentifiers}
+
+  ComputeOvercloudServicesDeployment_Step3:
+    type: OS::Heat::StructuredDeployments
+    depends_on: ComputeServicesBaseDeployment_Step2
+    properties:
+      name: ComputeOvercloudServicesDeployment_Step3
+      servers:  {get_param: servers}
+      config: {get_resource: ComputePuppetConfig}
+      input_values:
+        step: 3
+        update_identifier: {get_param: NodeConfigIdentifiers}
 
-  ComputePuppetDeployment:
+  ComputeOvercloudServicesDeployment_Step4:
     type: OS::Heat::StructuredDeployments
+    depends_on: ComputeOvercloudServicesDeployment_Step3
     properties:
-      name: ComputePuppetDeployment
+      name: ComputeOvercloudServicesDeployment_Step4
       servers:  {get_param: servers}
       config: {get_resource: ComputePuppetConfig}
       input_values:
+        step: 4
         update_identifier: {get_param: NodeConfigIdentifiers}
 
   # Note, this should come last, so use depends_on to ensure
   # this is created after any other resources.
   ExtraConfig:
-    depends_on: ComputePuppetDeployment
+    depends_on: ComputeOvercloudServicesDeployment_Step4
     type: OS::TripleO::NodeExtraConfigPost
     properties:
         servers: {get_param: servers}