From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 21 May 2015 08:13:40 +0000 (+0000)
Subject: Merge "Prepare for adding OpenStack services to Pacemaker"
X-Git-Tag: opnfv-6.0.0~2570
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=5f3f0f90c03035fe07f8ee63a183a3d709164ade;p=apex-tripleo-heat-templates.git

Merge "Prepare for adding OpenStack services to Pacemaker"
---

5f3f0f90c03035fe07f8ee63a183a3d709164ade
diff --cc puppet/manifests/overcloud_controller_pacemaker.pp
index 0ad8fde0,ecd5db5f..ac04e53e
--- a/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
    }