diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-12-15 13:26:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-12-15 13:26:50 +0000 |
| commit | 0df1c1589877ffd57b6ef933060f6d3316c9d343 (patch) | |
| tree | ee605e31177c69cde7aca90db5859e6483665327 /environments | |
| parent | 3e8010dc8506755f193d6e0f84006452b4eaeee5 (diff) | |
| parent | ea1294fe9b11029edab719e8bf558733226b3fd4 (diff) | |
Merge "Pacemaker maintenance mode for the duration of Puppet run on update"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/puppet-pacemaker.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml index f235cf8f..8986e35f 100644 --- a/environments/puppet-pacemaker.yaml +++ b/environments/puppet-pacemaker.yaml @@ -2,3 +2,5 @@ # Overcloud controller with Pacemaker. resource_registry: OS::TripleO::ControllerConfig: ../puppet/controller-config-pacemaker.yaml + OS::TripleO::Tasks::ControllerPrePuppet: ../extraconfig/tasks/pre_puppet_pacemaker.yaml + OS::TripleO::Tasks::ControllerPostPuppet: ../extraconfig/tasks/post_puppet_pacemaker.yaml |