diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-01 13:40:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-01 13:40:48 +0000 |
| commit | 389e7b42c0c1d9e81de928c6cc6763c294a9db6b (patch) | |
| tree | d6e8130cab2b875edd2a75d5b80319468f6db98a /manifests/profile | |
| parent | eb40fbc6903c591eaa0fc1770aa9bf635d4459df (diff) | |
| parent | 80d4af11d0fa3f30f831a2f269f00d2101ba4317 (diff) | |
Merge "Set manage_roles for all steps in Keystone/Pacemaker"
Diffstat (limited to 'manifests/profile')
| -rw-r--r-- | manifests/profile/pacemaker/keystone.pp | 8 |
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 } |