openstack/tripleo-heat-templates
Code Issues Proposed changes

Align puppet Controller post-deploy Deployment names

Browse Source 
Align all Deployment resource so we can use a glob convention for
stepped deployments via heat hooks/breakpoints.

Since most resources already use a FooDeployment_StepN convention,
align those which deviate from this as a precursor to supporting
stepped deployment, e.g stepping through "*Deployment_Step*".

Change-Id: I6bfee04649aa36116d1141ebe06d08b310ec8939
This commit is contained in:
Steven Hardy 2015-05-12 09:18:07 -04:00
parent eaa66742a7
commit 23c329bbb9
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
puppet/controller-post-puppet.yaml
View File

@ -13,9 +13,10 @@ resources:
type: OS::TripleO::ControllerConfig type: OS::TripleO::ControllerConfig
# Step through a series of Puppet runs using the same manifest. # Step through a series of Puppet runs using the same manifest.
# NOTE(dprince): Heat breakpoints would make for a really cool way to step # NOTE: To enable stepping through the deployments via heat hooks,
# through breakpoints in a controlled manner across the entire cluster # you must observe the glob naming defined in overcloud-steps.yaml
ControllerDeploymentLoadBalancer_Step1: # e.g all Deployment resources should have a *Deployment_StepN suffix
ControllerLoadBalancerDeployment_Step1:
type: OS::Heat::StructuredDeployments type: OS::Heat::StructuredDeployments
properties: properties:
servers: {get_param: servers} servers: {get_param: servers}
@ -24,9 +25,9 @@ resources:
step: 1 step: 1
actions: ['CREATE'] # no need for two passes on an UPDATE actions: ['CREATE'] # no need for two passes on an UPDATE
ControllerDeploymentServicesBase_Step2: ControllerServicesBaseDeployment_Step2:
type: OS::Heat::StructuredDeployments type: OS::Heat::StructuredDeployments
depends_on: ControllerDeploymentLoadBalancer_Step1 depends_on: ControllerLoadBalancerDeployment_Step1
properties: properties:
servers: {get_param: servers} servers: {get_param: servers}
config: {get_resource: ControllerPuppetConfig} config: {get_resource: ControllerPuppetConfig}
@ -49,12 +50,12 @@ resources:
ControllerRingbuilderDeployment_Step3: ControllerRingbuilderDeployment_Step3:
type: OS::Heat::StructuredDeployments type: OS::Heat::StructuredDeployments
depends_on: ControllerDeploymentServicesBase_Step2 depends_on: ControllerServicesBaseDeployment_Step2
properties: properties:
servers: {get_param: servers} servers: {get_param: servers}
config: {get_resource: ControllerRingbuilderPuppetConfig} config: {get_resource: ControllerRingbuilderPuppetConfig}
ControllerDeploymentOvercloudServices_Step4: ControllerOvercloudServicesDeployment_Step4:
type: OS::Heat::StructuredDeployments type: OS::Heat::StructuredDeployments
depends_on: ControllerRingbuilderDeployment_Step3 depends_on: ControllerRingbuilderDeployment_Step3
properties: properties:
@ -63,9 +64,9 @@ resources:
input_values: input_values:
step: 3 step: 3
ControllerDeploymentOvercloudServices_Step5: ControllerOvercloudServicesDeployment_Step5:
type: OS::Heat::StructuredDeployments type: OS::Heat::StructuredDeployments
depends_on: ControllerDeploymentOvercloudServices_Step4 depends_on: ControllerOvercloudServicesDeployment_Step4
properties: properties:
servers: {get_param: servers} servers: {get_param: servers}
config: {get_resource: ControllerPuppetConfig} config: {get_resource: ControllerPuppetConfig}
@ -75,8 +76,7 @@ resources:
# Note, this should come last, so use depends_on to ensure # Note, this should come last, so use depends_on to ensure
# this is created after any other resources. # this is created after any other resources.
ExtraConfig: ExtraConfig:
depends_on: ControllerDeploymentOvercloudServices_Step5 depends_on: ControllerOvercloudServicesDeployment_Step5
type: OS::TripleO::NodeExtraConfigPost type: OS::TripleO::NodeExtraConfigPost
properties: properties:
servers: {get_param: servers} servers: {get_param: servers}