X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fcinder-storage-post.yaml;h=c3dd403e500ed70b77f33670830e5aab42555e80;hb=ee5a98bbe45025b1fab76d338d38eb74c8c0bc43;hp=f470203f76c4c93bc7e1dc49dfb3b12513ddd6b8;hpb=fef01919e67e59f2ba0dc9d5b1ec5567dc9daabf;p=apex-tripleo-heat-templates.git

diff --git a/puppet/cinder-storage-post.yaml b/puppet/cinder-storage-post.yaml
index f470203f..c3dd403e 100644
--- a/puppet/cinder-storage-post.yaml
+++ b/puppet/cinder-storage-post.yaml
@@ -8,9 +8,12 @@ parameters:
     type: boolean
   servers:
     type: json
-  NodeConfigIdentifiers:
-     type: json
+  DeployIdentifier:
+     type: string
      description: Value which changes if the node configuration may need to be re-applied
+  RoleData:
+    type: json
+    default: {}
 
 resources:
 
@@ -23,7 +26,7 @@ resources:
       servers:  {get_param: servers}
       config: {get_resource: VolumeArtifactsConfig}
       input_values:
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   VolumePuppetConfig:
     type: OS::Heat::SoftwareConfig
@@ -32,22 +35,55 @@ resources:
       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_volume.pp
+        list_join:
+        - ''
+        - - get_file: manifests/overcloud_volume.pp
+          - {get_param: [RoleData, step_config]}
+
+  VolumeDeployment_Step2:
+    type: OS::Heat::StructuredDeployments
+    depends_on: VolumeArtifactsDeploy
+    properties:
+      name: VolumeDeployment_Step2
+      servers:  {get_param: servers}
+      config: {get_resource: VolumePuppetConfig}
+      input_values:
+        step: 2
+        update_identifier: {get_param: DeployIdentifier}
 
-  VolumeDeployment_Step1:
+  VolumeDeployment_Step3:
     type: OS::Heat::StructuredDeployments
+    depends_on: VolumeDeployment_Step2
     properties:
-      name: VolumeDeployment_Step1
+      name: VolumeDeployment_Step3
       servers:  {get_param: servers}
       config: {get_resource: VolumePuppetConfig}
+      input_values:
+        step: 3
+        update_identifier: {get_param: DeployIdentifier}
+
+  VolumeDeployment_Step4:
+    type: OS::Heat::StructuredDeployments
+    depends_on: VolumeDeployment_Step3
+    properties:
+      name: VolumeDeployment_Step4
+      servers:  {get_param: servers}
+      config: {get_resource: VolumePuppetConfig}
+      input_values:
+        step: 4
+        update_identifier: {get_param: DeployIdentifier}
 
   # Note, this should come last, so use depends_on to ensure
   # this is created after any other resources.
   ExtraConfig:
-    depends_on: VolumeDeployment_Step1
+    depends_on: VolumeDeployment_Step4
     type: OS::TripleO::NodeExtraConfigPost
     properties:
         servers: {get_param: servers}