aboutsummaryrefslogtreecommitdiffstats
path: root/environments/puppet-pacemaker.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-03-21 21:26:53 -0400
committerDan Prince <dprince@redhat.com>2016-04-09 08:36:04 -0400
commitde0ac7b2d6a2b58e2c39f06c8d4a72278b574201 (patch)
tree285fd3c24d505c541670db76e077b32ed1230583 /environments/puppet-pacemaker.yaml
parent2198be81563cc68551fa8defbba36ae3bf98d222 (diff)
composable keystone services
Adds new puppet and puppet pacemaker specific services for Keystone. The puppet manifests for keystone now live in puppet-tripleo. Hiera settings are driven by the nested stack heat templates and used to control puppet-keystone and puppet-tripleo directly. The Pacemaker template extends the default keystone service and swaps in the pacemaker specific puppet-tripleo profile instead. Change-Id: I8b30438a27e9d5ec4e7d335e0bd1a931a20b03a2 Depends-On: I2faf5a78db802549053ec41678bf83bf28108189
Diffstat (limited to 'environments/puppet-pacemaker.yaml')
-rw-r--r--environments/puppet-pacemaker.yaml6
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