diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-05-27 06:53:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-05-27 06:53:33 +0000 |
| commit | 00eb3b3089de1b5b61261f018068fd5daeb631e0 (patch) | |
| tree | 57173e7230c9832d3b7b4913f6d19fa67e730c57 /puppet | |
| parent | e051b32bac455cf0e82eaa42039a59dc51cdb3af (diff) | |
| parent | 13044ecee11e476a8b2f62091d9b517d46813573 (diff) | |
Merge "Add Keystone as Pacemaker resource"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 058d8c02..a7aa40cb 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -359,8 +359,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 @@ -692,6 +692,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", |