openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Start non-pacemakerized services in step 4"

This commit is contained in:
Jenkins 2015-05-21 10:11:12 +00:00 committed by Gerrit Code Review
parent 48f7d170f6 7f6df7c642
commit 87f2c951b8
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -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 {