Make puppet-applying *Post resources depend on hieradata

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

diff --git a/puppet/ceph-storage-post-puppet.yaml b/puppet/ceph-storage-post-puppet.yaml
index dd01d4f..1b5b944 100644 (file)
--- a/puppet/ceph-storage-post-puppet.yaml
+++ b/puppet/ceph-storage-post-puppet.yaml
@@ -1,11 +1,15 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 
 description: >
-  OpenStack Ceph Storage node post deployment for Puppet.
+  OpenStack ceph storage node post deployment for Puppet
 
 parameters:
   servers:
     type: json
+  NodeConfigIdentifiers:
+     type: json
+     description: Value which changes if the node configuration may need to be re-applied
+
 
 resources:
   CephStoragePuppetConfig:
@@ -17,8 +21,19 @@ resources:
       config:
         get_file: manifests/overcloud_cephstorage.pp
 
-  CephStoragePuppetDeployment:
+  CephStorageDeployment_Step1:
     type: OS::Heat::StructuredDeployments
     properties:
       servers:  {get_param: servers}
       config: {get_resource: CephStoragePuppetConfig}
+      input_values:
+        update_identifier: {get_param: NodeConfigIdentifiers}
+
+  # Note, this should come last, so use depends_on to ensure
+  # this is created after any other resources.
+  ExtraConfig:
+    depends_on: CephStorageDeployment_Step1
+    type: OS::TripleO::NodeExtraConfigPost
+    properties:
+        servers: {get_param: servers}
+