Merge "Template param for what command occ runs"

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

diff --git a/puppet/swift-storage-post.yaml b/puppet/swift-storage-post.yaml
index 1aba2bb..1c36a04 100644 (file)
--- a/puppet/swift-storage-post.yaml
+++ b/puppet/swift-storage-post.yaml
@@ -8,13 +8,12 @@ parameters:
     type: boolean
   servers:
     type: json
-  NodeConfigIdentifiers:
-     type: json
-     description: Value which changes if the node configuration may need to be re-applied
-  StepConfig:
+  RoleData:
+    type: json
+    default: {}
+  DeployIdentifier:
      type: string
-     description: Config manifests that will be used to step through the deployment.
-     default: ''
+     description: Value which changes if the node configuration may need to be re-applied
 
 resources:
 
@@ -27,7 +26,7 @@ resources:
       servers:  {get_param: servers}
       config: {get_resource: StorageArtifactsConfig}
       input_values:
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   StoragePuppetConfig:
     type: OS::Heat::SoftwareConfig
@@ -46,7 +45,7 @@ resources:
         - ''
         - - get_file: manifests/overcloud_object.pp
           - get_file: manifests/ringbuilder.pp
-          - {get_param: StepConfig}
+          - {get_param: [RoleData, step_config]}
 
   StorageRingbuilderDeployment_Step2:
     type: OS::Heat::StructuredDeployments
@@ -57,7 +56,7 @@ resources:
       config: {get_resource: StoragePuppetConfig}
       input_values:
         step: 2
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   StorageRingbuilderDeployment_Step3:
     type: OS::Heat::StructuredDeployments
@@ -68,7 +67,7 @@ resources:
       config: {get_resource: StoragePuppetConfig}
       input_values:
         step: 3
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   StorageDeployment_Step4:
     type: OS::Heat::StructuredDeployments
@@ -79,7 +78,7 @@ resources:
       config: {get_resource: StoragePuppetConfig}
       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.