Merge "Upgrade ceph-mon"

[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 edeb2d9..a83e0cf 100644 (file)
--- a/puppet/ceph-storage-post.yaml
+++ b/puppet/ceph-storage-post.yaml
@@ -10,12 +10,12 @@ parameters:
     type: boolean
   servers:
     type: json
-  NodeConfigIdentifiers:
-    type: json
-    description: Value which changes if the node configuration may need to be re-applied
   RoleData:
     type: json
     default: {}
+  DeployIdentifier:
+     type: string
+     description: Value which changes if the node configuration may need to be re-applied
 
 resources:
 
@@ -28,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
@@ -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:
@@ -57,7 +58,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
@@ -68,7 +69,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.