diff options
| author |   Jiri Stransky <jistr@redhat.com> | 2015-05-21 10:16:46 +0200 |
|---|---|---|
| committer | Jiri Stransky <jistr@redhat.com> | 2015-05-21 10:16:46 +0200 |
| commit | 7f6df7c642e02aba4b3975bf31cbc7330172e899 (patch) | |
| tree | 45353bc4b4d5c0aeca9b1f0db658d6d78a9a6488 /puppet | |
| parent | 43d4eee72884c23de2aef76436ba2044afdb80e8 (diff) | |
Start non-pacemakerized services in step 4
Previously we've been starting non-pacemakerized services in step 3 on
bootstrap node and in step 4 on others. Now that $sync_db in OpenStack
Puppet modules is decoupled from $enabled and $manage_service [1] we can
start the services in step 4 on all nodes.
[1] https://bugs.launchpad.net/puppet-glance/+bug/1452278
Change-Id: I6351d972ab00f4661d98338d95310d33f271de2f
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index ecd5db5f..9184f8b9 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 { |