diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-28 13:59:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-28 13:59:11 +0000 |
| commit | 03732f871ba237ec02f43537cecf8ca802d66210 (patch) | |
| tree | 0e2a6a48bc610d0e0786c1d169e6acb62565d888 /environments | |
| parent | 9c73a7316d6eb61701e60e40b454680971f108c7 (diff) | |
| parent | f918bdb0489963a20fe63cecb5b252378ed07f88 (diff) | |
Merge "Allow to manually disable post-puppet restarts"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/puppet-pacemaker-no-restart.yaml | 3 | ||||
| -rw-r--r-- | environments/puppet-pacemaker.yaml | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/environments/puppet-pacemaker-no-restart.yaml b/environments/puppet-pacemaker-no-restart.yaml new file mode 100644 index 00000000..67d8692d --- /dev/null +++ b/environments/puppet-pacemaker-no-restart.yaml @@ -0,0 +1,3 @@ +# use this file *in addition* to puppet-pacemaker.yaml +resource_registry: + OS::TripleO::Tasks::ControllerPostPuppetRestart: OS::Heat::None diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml index 4814f7bf..4622bc4d 100644 --- a/environments/puppet-pacemaker.yaml +++ b/environments/puppet-pacemaker.yaml @@ -4,6 +4,7 @@ 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 + OS::TripleO::Tasks::ControllerPostPuppetRestart: ../extraconfig/tasks/post_puppet_pacemaker_restart.yaml # custom pacemaker services # NOTE: For now we will need to specify overrides to all services |