Merge "Move VIP-related data to AllNodesConfig"

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

diff --git a/puppet/cinder-storage-post.yaml b/puppet/cinder-storage-post.yaml
index fa1516f..0620bc6 100644 (file)
--- a/puppet/cinder-storage-post.yaml
+++ b/puppet/cinder-storage-post.yaml
@@ -8,13 +8,13 @@ parameters:
     type: boolean
   servers:
     type: json
-  NodeConfigIdentifiers:
-     type: json
+  DeployIdentifier:
+     type: string
+     default: ''
      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 +27,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
@@ -38,6 +38,7 @@ resources:
         enable_debug: {get_param: ConfigDebug}
         enable_hiera: True
         enable_facter: False
+        modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules
       inputs:
       - name: step
       outputs:
@@ -46,7 +47,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 +58,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 +69,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 +80,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.