From: Giulio Fidente <gfidente@redhat.com>
Date: Wed, 29 Jun 2016 13:46:58 +0000 (+0200)
Subject: Set manage_roles for all steps in Keystone/Pacemaker
X-Git-Tag: opnfv-6.0.0~708^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=80d4af11d0fa3f30f831a2f269f00d2101ba4317;p=apex-puppet-tripleo.git

Set manage_roles for all steps in Keystone/Pacemaker

We the base::keystone profile is trying to create users and roles
before step 5, this change will set the a value for manage_roles
from the pacemaker profile for all steps.

Change-Id: I7aca8d6418988160641b29f9396a0fbe33b64e51
---

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
   }