summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Dobies <jason.dobies@redhat.com>2015-04-29 10:15:26 -0400
committerGiulio Fidente <gfidente@redhat.com>2015-05-22 10:33:40 +0200
commit13044ecee11e476a8b2f62091d9b517d46813573 (patch)
tree88106e786545686aacfa9860a22c8d9a6d7e1904
parent2c09ad590c05e6fd614f9ea78c43638c2a901930 (diff)
Add Keystone as Pacemaker resource
Change-Id: I4631f962415164975143e94ec0b251ee5972c552
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp9
1 files changed, 7 insertions, 2 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 99344532..a83b073a 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -363,8 +363,8 @@ if hiera('step') >= 3 {
class { '::keystone':
sync_db => $sync_db,
- manage_service => $non_pcmk_start,
- enabled => $non_pcmk_start,
+ manage_service => false,
+ enabled => false,
}
#TODO: need a cleanup-keystone-tokens.sh solution here
@@ -696,6 +696,11 @@ if hiera('step') >= 3 {
if hiera('step') >= 4 {
if $pacemaker_master {
+ # Keystone
+ pacemaker::resource::service { $::keystone::params::service_name :
+ clone_params => "interleave=true",
+ }
+
# Cinder
pacemaker::resource::service { $::cinder::params::api_service :
clone_params => "interleave=true",