diff options
author | 2015-12-15 13:26:50 +0000 | |
---|---|---|
committer | 2015-12-15 13:26:50 +0000 | |
commit | 0df1c1589877ffd57b6ef933060f6d3316c9d343 (patch) | |
tree | ee605e31177c69cde7aca90db5859e6483665327 /puppet/controller-post.yaml | |
parent | 3e8010dc8506755f193d6e0f84006452b4eaeee5 (diff) | |
parent | ea1294fe9b11029edab719e8bf558733226b3fd4 (diff) |
Merge "Pacemaker maintenance mode for the duration of Puppet run on update"
Diffstat (limited to 'puppet/controller-post.yaml')
-rw-r--r-- | puppet/controller-post.yaml | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/puppet/controller-post.yaml b/puppet/controller-post.yaml index 941e1ac5..ed8129e7 100644 --- a/puppet/controller-post.yaml +++ b/puppet/controller-post.yaml @@ -17,6 +17,13 @@ parameters: resources: + ControllerPrePuppet: + type: OS::TripleO::Tasks::ControllerPrePuppet + properties: + servers: {get_param: servers} + input_values: + update_identifier: {get_param: NodeConfigIdentifiers} + ControllerPuppetConfig: type: OS::TripleO::ControllerConfig @@ -26,6 +33,7 @@ resources: # e.g all Deployment resources should have a *Deployment_StepN suffix ControllerLoadBalancerDeployment_Step1: type: OS::Heat::StructuredDeployments + depends_on: ControllerPrePuppet properties: servers: {get_param: servers} config: {get_resource: ControllerPuppetConfig} @@ -98,10 +106,18 @@ resources: step: 5 update_identifier: {get_param: NodeConfigIdentifiers} + ControllerPostPuppet: + type: OS::TripleO::Tasks::ControllerPostPuppet + depends_on: ControllerOvercloudServicesDeployment_Step6 + properties: + servers: {get_param: servers} + 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: ControllerOvercloudServicesDeployment_Step5 + depends_on: ControllerPostPuppet type: OS::TripleO::NodeExtraConfigPost properties: servers: {get_param: servers} |