From: Brad P. Crochet <brad@redhat.com>
Date: Fri, 23 Sep 2016 13:10:47 +0000 (-0400)
Subject: Add support for rabbit hosts to mistral
X-Git-Tag: opnfv-6.0.0~569^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9af87616d17cd4e3d986794f9db002aa51dbccab;p=apex-puppet-tripleo.git

Add support for rabbit hosts to mistral

The mistral puppet did not have support for configuring the rabbit hosts.
This change adds that support.

Change-Id: I6cb2cbf4a2abf494668d24b8c36b0d525643f0af
---

diff --git a/manifests/profile/base/mistral.pp b/manifests/profile/base/mistral.pp
index cffb03e..3ebc3d5 100644
--- a/manifests/profile/base/mistral.pp
+++ b/manifests/profile/base/mistral.pp
@@ -27,9 +27,14 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
+# [*rabbit_hosts*]
+#   list of the rabbbit host IPs
+#   Defaults to hiera('rabbitmq_node_ips')
+
 class tripleo::profile::base::mistral (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
   $step           = hiera('step'),
+  $rabbit_hosts   = hiera('rabbitmq_node_ips', undef),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
@@ -42,7 +47,9 @@ class tripleo::profile::base::mistral (
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
-    include ::mistral
+    class  { '::mistral':
+      rabbit_hosts => $rabbit_hosts,
+    }
     include ::mistral::config
     include ::mistral::client
     include ::mistral::db::sync