Merge "Make service profiles default to rabbitmq_node_ips"

1 files changed, 8 insertions, 1 deletions

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
   }