aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2016-06-29 15:46:58 +0200
committerGiulio Fidente <gfidente@redhat.com>2016-06-29 15:52:05 +0200
commit80d4af11d0fa3f30f831a2f269f00d2101ba4317 (patch)
treed42215b0f799700a4f4523918c421a99f8a3b8b3 /manifests/profile
parent154f24b4972967480fdf02e6812b99f8a62d1db0 (diff)
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
Diffstat (limited to 'manifests/profile')
-rw-r--r--manifests/profile/pacemaker/keystone.pp8
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
}