X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fswift-storage-post.yaml;h=ee50c86a722e063e6e2a9b0e0009ab3fd5318bc2;hb=31dc73cbaa86dd723de28eca69d159a4860429dc;hp=3f0693197e2d4427f7d8b9ab85974a66ad6ee2fd;hpb=5bb35b7a050f23887a726547ce37519c6604e8fe;p=apex-tripleo-heat-templates.git

diff --git a/puppet/swift-storage-post.yaml b/puppet/swift-storage-post.yaml
index 3f069319..ee50c86a 100644
--- a/puppet/swift-storage-post.yaml
+++ b/puppet/swift-storage-post.yaml
@@ -1,11 +1,13 @@
-heat_template_version: 2014-10-16
-description: 'Swift Storage Post Deployment'
-# NOTE: this is a noop for os-apply-config style deployments because
-# post deployment ordering is controlled by tripleo-image-elements
+heat_template_version: 2015-04-30
+description: 'OpenStack swift 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:
 
@@ -23,6 +25,8 @@ resources:
     properties:
       servers:  {get_param: servers}
       config: {get_resource: StoragePuppetConfig}
+      input_values:
+        update_identifier: {get_param: NodeConfigIdentifiers}
 
   StorageRingbuilderPuppetConfig:
     type: OS::Heat::SoftwareConfig
@@ -39,3 +43,14 @@ resources:
     properties:
       servers:  {get_param: servers}
       config: {get_resource: StorageRingbuilderPuppetConfig}
+      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: StorageRingbuilderDeployment_Step2
+    type: OS::TripleO::NodeExtraConfigPost
+    properties:
+        servers: {get_param: servers}
+