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 +++++++++-
 manifests/profile/base/ceilometer.pp |  9 ++++++++-
 manifests/profile/base/cinder.pp     |  9 ++++++++-
 manifests/profile/base/glance/api.pp |  9 ++++++++-
 manifests/profile/base/heat.pp       |  6 ++++++
 manifests/profile/base/ironic.pp     |  8 +++++++-
 manifests/profile/base/keystone.pp   |  6 ++++++
 manifests/profile/base/manila/api.pp | 11 +++++++++--
 manifests/profile/base/neutron.pp    | 11 +++++++++--
 manifests/profile/base/nova.pp       |  9 ++++++++-
 manifests/profile/base/sahara.pp     |  8 +++++++-
 11 files changed, 85 insertions(+), 11 deletions(-)

(limited to 'manifests')

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
diff --git a/manifests/profile/base/ceilometer.pp b/manifests/profile/base/ceilometer.pp
index 88818de..aaf904f 100644
--- a/manifests/profile/base/ceilometer.pp
+++ b/manifests/profile/base/ceilometer.pp
@@ -23,12 +23,19 @@
 #   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::ceilometer (
   $step = hiera('step'),
+  $rabbit_hosts        = hiera('rabbitmq_node_ips', undef),
 ) {
 
   if $step >= 3 {
-    include ::ceilometer
+    class { '::ceilometer' :
+      rabbit_hosts => $rabbit_hosts,
+    }
     include ::ceilometer::config
   }
 
diff --git a/manifests/profile/base/cinder.pp b/manifests/profile/base/cinder.pp
index 43d95b4..510ea40 100644
--- a/manifests/profile/base/cinder.pp
+++ b/manifests/profile/base/cinder.pp
@@ -30,10 +30,15 @@
 #   (Optional) The current step of the deployment
 #   Defaults to hiera('step')
 #
+# [*rabbit_hosts*]
+#   list of the rabbbit host IPs
+#   Defaults to hiera('rabbitmq_node_ips')
+
 class tripleo::profile::base::cinder (
   $bootstrap_node         = hiera('bootstrap_nodeid', undef),
   $cinder_enable_db_purge = true,
   $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::cinder (
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
-    include ::cinder
+    class { '::cinder' :
+      rabbit_hosts => $rabbit_hosts,
+    }
     include ::cinder::config
   }
 
diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp
index 845fd41..ecffd7f 100644
--- a/manifests/profile/base/glance/api.pp
+++ b/manifests/profile/base/glance/api.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::glance::api (
   $glance_backend = downcase(hiera('glance_backend', 'swift')),
   $step           = hiera('step'),
+  $rabbit_hosts   = hiera('rabbitmq_node_ips', undef),
 ) {
 
   if $step >= 4 {
@@ -48,7 +53,9 @@ class tripleo::profile::base::glance::api (
     class { '::glance::api':
       stores => $glance_store,
     }
-    include ::glance::notify::rabbitmq
+    class { '::glance::notify::rabbitmq' :
+      rabbit_hosts => $rabbit_hosts,
+    }
     include join(['::glance::backend::', $glance_backend])
   }
 
diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp
index cafe95e..027ab7e 100644
--- a/manifests/profile/base/heat.pp
+++ b/manifests/profile/base/heat.pp
@@ -35,11 +35,16 @@
 #   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::heat (
   $bootstrap_node      = downcase(hiera('bootstrap_nodeid')),
   $manage_db_purge     = hiera('heat_enable_db_purge', true),
   $notification_driver = 'messaging',
   $step                = hiera('step'),
+  $rabbit_hosts        = hiera('rabbitmq_node_ips', undef),
 ) {
   # Domain resources will be created at step5 on the bootstrap_node so we
   # configure heat.conf at step3 and 4 but actually create the domain later.
@@ -54,6 +59,7 @@ class tripleo::profile::base::heat (
   if $step >= 4 {
     class { '::heat' :
       notification_driver => $notification_driver,
+      rabbit_hosts        => $rabbit_hosts,
     }
     include ::heat::config
     include ::heat::cors
diff --git a/manifests/profile/base/ironic.pp b/manifests/profile/base/ironic.pp
index da89839..6c0769a 100644
--- a/manifests/profile/base/ironic.pp
+++ b/manifests/profile/base/ironic.pp
@@ -26,9 +26,14 @@
 #   (Optional) The current step of the deployment
 #   Defaults to hiera('step')
 #
+# [*rabbit_hosts*]
+#   list of the rabbbit host IPs
+#   Defaults to hiera('rabbitmq_node_ips')
+
 class tripleo::profile::base::ironic (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
   $step           = hiera('step'),
+  $rabbit_hosts   = hiera('rabbitmq_node_ips', undef),
 ) {
   # Database is accessed by both API and conductor, hence it's here.
   if $::hostname == downcase($bootstrap_node) {
@@ -43,7 +48,8 @@ class tripleo::profile::base::ironic (
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
     class { '::ironic':
-      sync_db => $sync_db,
+      sync_db      => $sync_db,
+      rabbit_hosts => $rabbit_hosts,
     }
 
     include ::ironic::cors
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index 354d24c..13ef700 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -31,10 +31,15 @@
 #   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::keystone (
   $bootstrap_node  = hiera('bootstrap_nodeid', undef),
   $manage_db_purge = hiera('keystone_enable_db_purge', true),
   $step            = hiera('step'),
+  $rabbit_hosts    = hiera('rabbitmq_node_ips', undef),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
@@ -54,6 +59,7 @@ class tripleo::profile::base::keystone (
     class { '::keystone':
       sync_db          => $sync_db,
       enable_bootstrap => $sync_db,
+      rabbit_hosts     => $rabbit_hosts,
     }
 
     include ::keystone::config
diff --git a/manifests/profile/base/manila/api.pp b/manifests/profile/base/manila/api.pp
index 9a3a314..89ff810 100644
--- a/manifests/profile/base/manila/api.pp
+++ b/manifests/profile/base/manila/api.pp
@@ -23,11 +23,18 @@
 #   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::manila::api (
-  $step = hiera('step'),
+  $step         = hiera('step'),
+  $rabbit_hosts = hiera('rabbitmq_node_ips', undef),
 ) {
   if $step >= 4 {
-    include ::manila
+    class { '::manila' :
+      rabbit_hosts => $rabbit_hosts,
+    }
     include ::manila::api
   }
 }
diff --git a/manifests/profile/base/neutron.pp b/manifests/profile/base/neutron.pp
index 7b07b1f..90a5c23 100644
--- a/manifests/profile/base/neutron.pp
+++ b/manifests/profile/base/neutron.pp
@@ -22,11 +22,18 @@
 #   (Optional) The current step of the deployment
 #   Defaults to hiera('step')
 #
+# [*rabbit_hosts*]
+#   list of the rabbbit host IPs
+#   Defaults to hiera('rabbitmq_node_ips')
+
 class tripleo::profile::base::neutron (
-  $step = hiera('step'),
+  $step         = hiera('step'),
+  $rabbit_hosts = hiera('rabbitmq_node_ips', undef),
 ) {
   if $step >= 3 {
-    include ::neutron
+    class { '::neutron' :
+      rabbit_hosts => $rabbit_hosts,
+    }
     include ::neutron::config
   }
 }
diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp
index b43b8e8..74f0460 100644
--- a/manifests/profile/base/nova.pp
+++ b/manifests/profile/base/nova.pp
@@ -38,12 +38,17 @@
 #   (Optional) The current step of the deployment
 #   Defaults to hiera('step')
 #
+# [*rabbit_hosts*]
+#   list of the rabbbit host IPs
+#   Defaults to hiera('rabbitmq_node_ips')
+
 class tripleo::profile::base::nova (
   $bootstrap_node       = hiera('bootstrap_nodeid', undef),
   $libvirt_enabled      = false,
   $manage_migration     = false,
   $nova_compute_enabled = false,
   $step                 = hiera('step'),
+  $rabbit_hosts         = hiera('rabbitmq_node_ips', undef),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
@@ -58,7 +63,9 @@ class tripleo::profile::base::nova (
   }
 
   if hiera('step') >= 4 or (hiera('step') >= 3 and $sync_db) {
-    include ::nova
+    class { '::nova' :
+      rabbit_hosts => $rabbit_hosts,
+    }
     include ::nova::config
     class { '::nova::cache':
       enabled          => true,
diff --git a/manifests/profile/base/sahara.pp b/manifests/profile/base/sahara.pp
index 96d23a6..cf0ee90 100644
--- a/manifests/profile/base/sahara.pp
+++ b/manifests/profile/base/sahara.pp
@@ -26,9 +26,14 @@
 #   (Optional) The current step of the deployment
 #   Defaults to hiera('step')
 #
+# [*rabbit_hosts*]
+#   list of the rabbbit host IPs
+#   Defaults to hiera('rabbitmq_node_ips')
+
 class tripleo::profile::base::sahara (
   $bootstrap_node = hiera('bootstrap_nodeid', undef),
   $step           = hiera('step'),
+  $rabbit_hosts   = hiera('rabbitmq_node_ips', undef),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $sync_db = true
@@ -38,7 +43,8 @@ class tripleo::profile::base::sahara (
 
   if $step >= 4 or ($step >= 3 and $sync_db){
     class { '::sahara':
-      sync_db => $sync_db,
+      sync_db      => $sync_db,
+      rabbit_hosts => $rabbit_hosts,
     }
   }
 }
-- 
cgit 1.2.3-korg