summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-21 10:11:12 +0000
committerGerrit Code Review <review@openstack.org>2015-05-21 10:11:13 +0000
commit87f2c951b895ff01dd49a2afc858664b0c6ef5a3 (patch)
tree1219a08d403c553870ca83ccb0f36666c2a1ff98 /puppet
parent48f7d170f6558ffe17627732522f9f2b95c72384 (diff)
parent7f6df7c642e02aba4b3975bf31cbc7330172e899 (diff)
Merge "Start non-pacemakerized services in step 4"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp5
1 files changed, 1 insertions, 4 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 1d518b1d..ce8e81ee 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -38,12 +38,9 @@ if $::hostname == downcase(hiera('bootstrap_nodeid')) {
}
# When to start and enable services which haven't been Pacemakerized
-# FIXME: change to only step 4 after this patch is merged:
-# https://review.openstack.org/#/c/180565/
-# $non_pcmk_start = hiera('step') >= 4
# FIXME: remove when we start all OpenStack services using Pacemaker
# (occurences of this variable will be gradually replaced with false)
-$non_pcmk_start = hiera('step') >= 4 or (hiera('step') >= 3 and $pacemaker_master)
+$non_pcmk_start = hiera('step') >= 4
if hiera('step') >= 1 {