Merge "Prepare for adding OpenStack services to Pacemaker"

diff --cc puppet/manifests/overcloud_controller_pacemaker.pp
index 0ad8fde,ecd5db5..ac04e53
--- 1/puppet/manifests/overcloud_controller_pacemaker.pp
--- 2/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@@ -37,10 -37,16 +37,18 @@@ if $::hostname == downcase(hiera('boots
    $sync_db = false
  }
  
+ # 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)
+ 
  if hiera('step') >= 1 {
  
 +  create_resources(sysctl::value, hiera('sysctl_settings'), {})
 +
    if count(hiera('ntp::servers')) > 0 {
      include ::ntp
    }