diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-04-11 12:51:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-04-11 12:51:12 +0000 |
| commit | 2d4c27dac5efc33cdd547ad2bcdd88f28809052b (patch) | |
| tree | 821b9a1d3b68888bb8c63d9bae909fea58f4eaa0 /environments | |
| parent | 7e31906d0185c68433215f265ae1ec1c485a3dd2 (diff) | |
| parent | de0ac7b2d6a2b58e2c39f06c8d4a72278b574201 (diff) | |
Merge "composable keystone services"
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/puppet-pacemaker.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml index 8986e35f..e3188090 100644 --- a/environments/puppet-pacemaker.yaml +++ b/environments/puppet-pacemaker.yaml @@ -4,3 +4,9 @@ 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 + + # custom pacemaker services + # NOTE: For now we will need to specify overrides to all services + # which use pacemaker. In the future (with upcoming HA light work) this + # list will hopefully be much smaller however. + OS::TripleO::Services::Keystone: ../puppet/services/pacemaker/keystone.yaml |