From e5f0042e47eb4c2b77348dcec0d3d2730e5d9841 Mon Sep 17 00:00:00 2001
From: Steven Hardy <shardy@redhat.com>
Date: Sun, 28 Aug 2016 12:18:07 +0100
Subject: Make service profiles default to rabbitmq_node_ips

Instead of hard-coded yaml aliases in t-h-t, make each service
profile that requires rabbit default to the list of rabbit ips.

Note this could still be extended in future to e.g enable per
service rabbit clusters, but the default is to lookup the
hiera which should be logically equivalent to current t-h-t.

Change-Id: Ie53c93456529420588eb1927703ea91b54095d87
Partially-Implements: blueprint custom-roles
---
 manifests/profile/base/aodh.pp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'manifests/profile/base/aodh.pp')

diff --git a/manifests/profile/base/aodh.pp b/manifests/profile/base/aodh.pp
index 07c0a88..2fad5b3 100644
--- a/manifests/profile/base/aodh.pp
+++ b/manifests/profile/base/aodh.pp
@@ -27,9 +27,15 @@
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
 #   Defaults to hiera('bootstrap_nodeid')
 #
+# [*rabbit_hosts*]
+#   list of the rabbbit host IPs
+#   Defaults to hiera('rabbitmq_node_ips')
+#
+
 class tripleo::profile::base::aodh (
   $step           = hiera('step'),
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $rabbit_hosts   = hiera('rabbitmq_node_ips', undef),
 ) {
 
   if $::hostname == downcase($bootstrap_node) {
@@ -43,7 +49,9 @@ class tripleo::profile::base::aodh (
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
-    include ::aodh
+    class { '::aodh' :
+      rabbit_hosts => $rabbit_hosts,
+    }
     include ::aodh::auth
     include ::aodh::config
     include ::aodh::client
-- 
cgit 1.2.3-korg