Merge "Set manage_roles for all steps in Keystone/Pacemaker"

1 files changed, 1 insertions, 7 deletions

diff --git a/manifests/profile/pacemaker/keystone.pp b/manifests/profile/pacemaker/keystone.pp
index 497d6f3..46a40db 100644
--- a/manifests/profile/pacemaker/keystone.pp
+++ b/manifests/profile/pacemaker/keystone.pp
@@ -46,15 +46,9 @@ class tripleo::profile::pacemaker::keystone (
 
   if $::hostname == downcase($bootstrap_node) {
     $pacemaker_master = true
-  } else {
-    $pacemaker_master = false
-  }
-
-  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']
   } else {
+    $pacemaker_master = false
     $manage_roles = false
   }