swift/proxy: configure rabbitmq properly

Use rabbitmq_node_ips to find out where rabbitmq nodes are, and have
correct ipv6 syntax if required.

Closes-Bug: 1637443
Change-Id: Ibc0ed642931dd3ada7ee594bb8c70a1c3462206d

diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp
index feabf86..15b4686 100644 (file)
--- a/manifests/profile/base/swift/proxy.pp
+++ b/manifests/profile/base/swift/proxy.pp
@@ -31,10 +31,20 @@
 #   (Optional) memcache port
 #   Defaults to 11211
 #
+# [*rabbit_hosts*]
+#   list of the rabbbit host IPs
+#   Defaults to hiera('rabbitmq_node_ips')
+#
+# [*rabbit_port*]
+#   IP port for rabbitmq service
+#   Defaults to hiera('swift::proxy::ceilometer::rabbit_port', 5672)
+#
 class tripleo::profile::base::swift::proxy (
-  $step = hiera('step'),
+  $step             = hiera('step'),
   $memcache_servers = hiera('memcached_node_ips'),
-  $memcache_port = 11211,
+  $memcache_port    = 11211,
+  $rabbit_hosts     = hiera('rabbitmq_node_ips', undef),
+  $rabbit_port      = hiera('swift::proxy::ceilometer::rabbit_port', 5672),
 ) {
   if $step >= 4 {
     $swift_memcache_servers = suffix(any2array(normalize_ip_for_uri($memcache_servers)), ":${memcache_port}")
@@ -53,7 +63,10 @@ class tripleo::profile::base::swift::proxy (
     include ::swift::proxy::tempurl
     include ::swift::proxy::formpost
     include ::swift::proxy::bulk
-    include ::swift::proxy::ceilometer
+    $swift_rabbit_hosts = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}")
+    class { '::swift::proxy::ceilometer':
+      rabbit_hosts => $swift_rabbit_hosts,
+    }
     include ::swift::proxy::versioned_writes
   }
 }