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

diff --git a/puppet/cinder-storage-post.yaml b/puppet/cinder-storage-post.yaml
index fa1516f1..c3dd403e 100644
--- a/puppet/cinder-storage-post.yaml
+++ b/puppet/cinder-storage-post.yaml
@@ -8,13 +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
-  StepConfig:
-    type: string
-    description: Config manifests that will be used to step through the deployment.
-    default: ''
+  RoleData:
+    type: json
+    default: {}
 
 resources:
 
@@ -27,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
@@ -46,7 +45,7 @@ resources:
         list_join:
         - ''
         - - get_file: manifests/overcloud_volume.pp
-          - {get_param: StepConfig}
+          - {get_param: [RoleData, step_config]}
 
   VolumeDeployment_Step2:
     type: OS::Heat::StructuredDeployments
@@ -57,7 +56,7 @@ resources:
       config: {get_resource: VolumePuppetConfig}
       input_values:
         step: 2
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   VolumeDeployment_Step3:
     type: OS::Heat::StructuredDeployments
@@ -68,7 +67,7 @@ resources:
       config: {get_resource: VolumePuppetConfig}
       input_values:
         step: 3
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   VolumeDeployment_Step4:
     type: OS::Heat::StructuredDeployments
@@ -79,7 +78,7 @@ resources:
       config: {get_resource: VolumePuppetConfig}
       input_values:
         step: 4
-        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.