diff options
Diffstat (limited to 'manifests/profile/pacemaker/keystone.pp')
| -rw-r--r-- | manifests/profile/pacemaker/keystone.pp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/manifests/profile/pacemaker/keystone.pp b/manifests/profile/pacemaker/keystone.pp index fb625e5..42c44d4 100644 --- a/manifests/profile/pacemaker/keystone.pp +++ b/manifests/profile/pacemaker/keystone.pp @@ -50,7 +50,7 @@ class tripleo::profile::pacemaker::keystone ( $pacemaker_master = false } - if $step >= 6 and $pacemaker_master { + if $step >= 5 and $pacemaker_master { $manage_roles = true Pacemaker::Resource::Service[$::apache::params::service_name] -> Class['::keystone::roles::admin'] Pacemaker::Resource::Service[$::apache::params::service_name] -> Class['::keystone::endpoint'] @@ -60,8 +60,6 @@ class tripleo::profile::pacemaker::keystone ( class { '::tripleo::profile::base::keystone': sync_db => $pacemaker_master, - manage_service => false, - enabled => false, bootstrap_master => $pacemaker_master, manage_roles => $manage_roles, manage_endpoint => $manage_roles @@ -74,6 +72,7 @@ class tripleo::profile::pacemaker::keystone ( second_resource => 'openstack-core-clone', first_action => 'start', second_action => 'start', + before => Pacemaker::Resource::Service[$::apache::params::service_name], require => [Pacemaker::Resource::Service['haproxy'], Pacemaker::Resource::Ocf['openstack-core']], } @@ -86,6 +85,7 @@ class tripleo::profile::pacemaker::keystone ( second_resource => 'openstack-core-clone', first_action => 'start', second_action => 'start', + before => Pacemaker::Resource::Service[$::apache::params::service_name], require => [Pacemaker::Resource::Ocf['rabbitmq'], Pacemaker::Resource::Ocf['openstack-core']], } |