Use optimized config for RabbitMQ cluster

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

diff --git a/puppet/swift-storage-post.yaml b/puppet/swift-storage-post.yaml
index 89cf973..3e01fe7 100644 (file)
--- 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}
+