summaryrefslogtreecommitdiffstats
path: root/manifests/profile
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2016-05-10 08:56:55 -0400
committerEmilien Macchi <emilien@redhat.com>2016-05-10 21:49:11 +0000
commit74c573eabbed37e689f1ffefdbe33c9cb3f19de8 (patch)
tree73f2934f9a7d3db90cfa7cdfe2cf2a7d444b2da9 /manifests/profile
parent42865aed6f3375edbac31a52bb9e73cabfbb059a (diff)
keystone: drop usage of step 6
* Manage roles & endpoints at step 5 * Set correct orchestration for Pacemaker resources within a single step. Change-Id: I079e65f535af069312b602e8ff58be80ab2f2226
Diffstat (limited to 'manifests/profile')
-rw-r--r--manifests/profile/pacemaker/keystone.pp4
1 files changed, 3 insertions, 1 deletions
diff --git a/manifests/profile/pacemaker/keystone.pp b/manifests/profile/pacemaker/keystone.pp
index fb625e5..712d58d 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']
@@ -74,6 +74,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 +87,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']],
}