Add support for Redis configuration

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

diff --git a/puppet/controller-post-puppet.yaml b/puppet/controller-post-puppet.yaml
index 38a7e59..009a10a 100644 (file)
--- a/puppet/controller-post-puppet.yaml
+++ b/puppet/controller-post-puppet.yaml
@@ -24,20 +24,19 @@ resources:
   # Step through a series of Puppet runs using the same manifest.
   # NOTE(dprince): Heat breakpoints would make for a really cool way to step
   # through breakpoints in a controlled manner across the entire cluster
-  ControllerPuppetDeploymentLoadBalancer:
+  ControllerDeploymentLoadBalancer_Step1:
     type: OS::Heat::StructuredDeployments
     properties:
-      name: puppet_1
       servers:  {get_param: servers}
       config: {get_resource: ControllerPuppetConfig}
       input_values:
         step: 1
       actions: ['CREATE'] # no need for two passes on an UPDATE
 
-  ControllerPuppetDeploymentServicesBase:
+  ControllerDeploymentServicesBase_Step2:
     type: OS::Heat::StructuredDeployments
+    depends_on: ControllerDeploymentLoadBalancer_Step1
     properties:
-      name: puppet_2
       servers:  {get_param: servers}
       config: {get_resource: ControllerPuppetConfig}
       input_values:
@@ -57,17 +56,17 @@ resources:
       config:
         get_file: manifests/ringbuilder.pp
 
-  ControllerRingbuilderPuppetDeployment:
+  ControllerRingbuilderDeployment_Step3:
     type: OS::Heat::StructuredDeployments
+    depends_on: ControllerDeploymentServicesBase_Step2
     properties:
-      name: puppet_3
       servers:  {get_param: servers}
       config: {get_resource: ControllerRingbuilderPuppetConfig}
 
-  ControllerPuppetDeploymentOvercloudServices:
+  ControllerDeploymentOvercloudServices_Step4:
     type: OS::Heat::StructuredDeployments
+    depends_on: ControllerRingbuilderDeployment_Step3
     properties:
-      name: puppet_4
       servers:  {get_param: servers}
       config: {get_resource: ControllerPuppetConfig}
       input_values: