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

diff --git a/manifests/profile/pacemaker/keystone.pp b/manifests/profile/pacemaker/keystone.pp
index fb625e5..712d58d 100644 (file)
--- 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']],
     }