openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Add Keystone as Pacemaker resource"

This commit is contained in:
Jenkins 2015-05-27 06:53:33 +00:00 committed by Gerrit Code Review
parent e051b32bac 13044ecee1
commit 00eb3b3089
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -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",