Merge "Remove unneeded net_ip_map dump into hieradata"

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

diff --git a/puppet/ceph-storage-post.yaml b/puppet/ceph-storage-post.yaml
index 2b9ae75..70baeb6 100644 (file)
--- a/puppet/ceph-storage-post.yaml
+++ b/puppet/ceph-storage-post.yaml
@@ -10,13 +10,12 @@ parameters:
     type: boolean
   servers:
     type: json
-  NodeConfigIdentifiers:
-     type: json
+  RoleData:
+    type: json
+    default: {}
+  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: ''
 
 resources:
 
@@ -29,7 +28,7 @@ resources:
       servers:  {get_param: servers}
       config: {get_resource: CephStorageArtifactsConfig}
       input_values:
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   CephStoragePuppetConfig:
     type: OS::Heat::SoftwareConfig
@@ -47,7 +46,7 @@ resources:
         list_join:
         - ''
         - - get_file: manifests/overcloud_cephstorage.pp
-          - {get_param: StepConfig}
+          - {get_param: [RoleData, step_config]}
 
   CephStorageDeployment_Step2:
     type: OS::Heat::StructuredDeployments
@@ -58,7 +57,7 @@ resources:
       config: {get_resource: CephStoragePuppetConfig}
       input_values:
         step: 2
-        update_identifier: {get_param: NodeConfigIdentifiers}
+        update_identifier: {get_param: DeployIdentifier}
 
   CephStorageDeployment_Step3:
     type: OS::Heat::StructuredDeployments
@@ -69,7 +68,7 @@ resources:
       config: {get_resource: CephStoragePuppetConfig}
       input_values:
         step: 3
-        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.