From: Carlos Camacho <ccamacho@redhat.com>
Date: Tue, 9 Aug 2016 14:22:50 +0000 (+0200)
Subject: Fix mistral sync_db profile steps
X-Git-Tag: opnfv-6.0.0~635^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=21bb7e4ac1051d28bb83de522f3cc6f79c0445e2;p=apex-puppet-tripleo.git

Fix mistral sync_db profile steps

The services in the mistral profiles were
limited to be executed only in the
bootstrap master node.

Change-Id: Iae42ffa37c4c9b1e070b7c3753e04c45bb97703f
---

diff --git a/manifests/profile/base/mistral.pp b/manifests/profile/base/mistral.pp
index febbae6..0c41193 100644
--- a/manifests/profile/base/mistral.pp
+++ b/manifests/profile/base/mistral.pp
@@ -41,7 +41,7 @@ class tripleo::profile::base::mistral (
     include ::mistral::db::mysql
   }
 
-  if $step >= 4 and $sync_db {
+  if $step >= 4 or ($step >= 3 and $sync_db) {
     include ::mistral
     include ::mistral::config
     include ::mistral::client
diff --git a/manifests/profile/base/mistral/api.pp b/manifests/profile/base/mistral/api.pp
index aeff788..50708f1 100644
--- a/manifests/profile/base/mistral/api.pp
+++ b/manifests/profile/base/mistral/api.pp
@@ -39,7 +39,7 @@ class tripleo::profile::base::mistral::api (
 
   include ::tripleo::profile::base::mistral
 
-  if $step >= 4 and $sync_db {
+  if $step >= 4 or ($step >= 3 and $sync_db) {
     include ::mistral::api
   }
 }
diff --git a/manifests/profile/base/mistral/engine.pp b/manifests/profile/base/mistral/engine.pp
index cf82237..b2d8864 100644
--- a/manifests/profile/base/mistral/engine.pp
+++ b/manifests/profile/base/mistral/engine.pp
@@ -39,7 +39,7 @@ class tripleo::profile::base::mistral::engine (
 
   include ::tripleo::profile::base::mistral
 
-  if $step >= 4 and $sync_db {
+  if $step >= 4 or ($step >= 3 and $sync_db)  {
     include ::mistral::engine
   }
 
diff --git a/manifests/profile/base/mistral/executor.pp b/manifests/profile/base/mistral/executor.pp
index dd8c642..8e3f2c9 100644
--- a/manifests/profile/base/mistral/executor.pp
+++ b/manifests/profile/base/mistral/executor.pp
@@ -39,7 +39,7 @@ class tripleo::profile::base::mistral::executor (
 
   include ::tripleo::profile::base::mistral
 
-  if $step >= 4 and $sync_db {
+  if $step >= 4 or ($step >= 3 and $sync_db)  {
     include ::mistral::executor
   }
 }