From: Carlos Camacho <ccamacho@redhat.com>
Date: Mon, 8 Aug 2016 11:43:37 +0000 (+0200)
Subject: Fix deployment steps for AODH profiles
X-Git-Tag: opnfv-6.0.0~629^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=65ea36f60e2f12e258babc86b83fe7a28ee870a4;p=apex-puppet-tripleo.git

Fix deployment steps for AODH profiles

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

Change-Id: I85cfa97f0e5e9a70e86e51d8188a2abf86e2ec1c
---

diff --git a/manifests/profile/base/aodh.pp b/manifests/profile/base/aodh.pp
index 28156a0..07c0a88 100644
--- a/manifests/profile/base/aodh.pp
+++ b/manifests/profile/base/aodh.pp
@@ -42,7 +42,7 @@ class tripleo::profile::base::aodh (
     include ::aodh::db::mysql
   }
 
-  if $step >= 4 and $sync_db {
+  if $step >= 4 or ($step >= 3 and $sync_db) {
     include ::aodh
     include ::aodh::auth
     include ::aodh::config
diff --git a/manifests/profile/base/aodh/api.pp b/manifests/profile/base/aodh/api.pp
index 3aa436d..19ecfaf 100644
--- a/manifests/profile/base/aodh/api.pp
+++ b/manifests/profile/base/aodh/api.pp
@@ -40,7 +40,7 @@ class tripleo::profile::base::aodh::api (
 
   include ::tripleo::profile::base::aodh
 
-  if $step >= 4 and $sync_db {
+  if $step >= 4 {
     include ::aodh::api
     include ::aodh::wsgi::apache
   }
diff --git a/manifests/profile/base/aodh/evaluator.pp b/manifests/profile/base/aodh/evaluator.pp
index 46d1d14..ca506bc 100644
--- a/manifests/profile/base/aodh/evaluator.pp
+++ b/manifests/profile/base/aodh/evaluator.pp
@@ -40,7 +40,7 @@ class tripleo::profile::base::aodh::evaluator (
 
   include ::tripleo::profile::base::aodh
 
-  if $step >= 4 and $sync_db {
+  if $step >= 4 {
     include ::aodh::evaluator
   }
 
diff --git a/manifests/profile/base/aodh/listener.pp b/manifests/profile/base/aodh/listener.pp
index 93f37fa..57ad27f 100644
--- a/manifests/profile/base/aodh/listener.pp
+++ b/manifests/profile/base/aodh/listener.pp
@@ -40,7 +40,7 @@ class tripleo::profile::base::aodh::listener (
 
   include ::tripleo::profile::base::aodh
 
-  if $step >= 4 and $sync_db {
+  if $step >= 4 {
     include ::aodh::listener
   }
 
diff --git a/manifests/profile/base/aodh/notifier.pp b/manifests/profile/base/aodh/notifier.pp
index 0686012..03a0a6f 100644
--- a/manifests/profile/base/aodh/notifier.pp
+++ b/manifests/profile/base/aodh/notifier.pp
@@ -40,7 +40,7 @@ class tripleo::profile::base::aodh::notifier (
 
   include ::tripleo::profile::base::aodh
 
-  if $step >= 4 and $sync_db {
+  if $step >= 4 {
     include ::aodh::notifier
   }