From: Giulio Fidente <gfidente@redhat.com>
Date: Fri, 22 Apr 2016 17:19:33 +0000 (+0200)
Subject: Run sync in step 3 when $sync_db
X-Git-Tag: opnfv-6.0.0~2023^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=efadbd85a444851a83e3ebed42b4dab36e9c784f;p=apex-tripleo-heat-templates.git

Run sync in step 3 when $sync_db

This will configure the openstack services and run the initial
db sync in step 3 (instead of step 4) for the node for which
$sync_db is true.

Closes-Bug: #1572952
Change-Id: I29012ee0a8b281e4472353ee7d9d44912e8a9b6c
---

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index b3b6ce54..0372a56b 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -473,7 +473,7 @@ MYSQL_HOST=localhost\n",
 
 } #END STEP 2
 
-if hiera('step') >= 4 {
+if hiera('step') >= 4 or ( hiera('step') >= 3 and $sync_db ) {
 
   $nova_ipv6 = hiera('nova::use_ipv6', false)
   if $nova_ipv6 {