X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fswift-storage-post.yaml;h=3e01fe772253b1a165530c5dd0ea18e9832d250b;hb=bf618365914b8fbf7f6b6bc37fcc05574ab3af99;hp=89cf973335efad5be4797278e20ee3d2dee8a1fc;hpb=66aaf72d35fc7c9be5d4fc7605f8ad6d7b5c520e;p=apex-tripleo-heat-templates.git

diff --git a/puppet/swift-storage-post.yaml b/puppet/swift-storage-post.yaml
index 89cf9733..3e01fe77 100644
--- a/puppet/swift-storage-post.yaml
+++ b/puppet/swift-storage-post.yaml
@@ -1,7 +1,5 @@
 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
+description: 'OpenStack swift storage node post deployment for Puppet'
 
 parameters:
   servers:
@@ -18,10 +16,9 @@ resources:
       config:
         get_file: manifests/overcloud_object.pp
 
-  StoragePuppetDeployment:
+  StorageDeployment_Step1:
     type: OS::Heat::StructuredDeployments
     properties:
-      name: puppet_1
       servers:  {get_param: servers}
       config: {get_resource: StoragePuppetConfig}
 
@@ -34,9 +31,18 @@ resources:
       config:
         get_file: manifests/ringbuilder.pp
 
-  StorageRingbuilderPuppetDeployment:
+  StorageRingbuilderDeployment_Step2:
     type: OS::Heat::StructuredDeployments
+    depends_on: StorageDeployment_Step1
     properties:
-      name: puppet_2
       servers:  {get_param: servers}
       config: {get_resource: StorageRingbuilderPuppetConfig}
+
+  # 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}
+