From 274156e5bab7a6c252d9c13015a1d4d14801e770 Mon Sep 17 00:00:00 2001
From: Brent Eagles <beagles@redhat.com>
Date: Tue, 8 Nov 2016 01:02:29 -0330
Subject: Add proper handling of IPv6 addresses for rabbit host/port handling

This patch changes the rabbit_hosts config generation to work properly
with IPv6 addresses.

Closes-Bug: #1639881
Change-Id: I07cd983880a4a75a051e081dcb96134cb5c6f5e8
---
 manifests/profile/base/ironic.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/manifests/profile/base/ironic.pp b/manifests/profile/base/ironic.pp
index e63e4c6..7b44421 100644
--- a/manifests/profile/base/ironic.pp
+++ b/manifests/profile/base/ironic.pp
@@ -48,9 +48,10 @@ class tripleo::profile::base::ironic (
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
+    $rabbit_endpoints = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}")
     class { '::ironic':
       sync_db      => $sync_db,
-      rabbit_hosts => suffix($rabbit_hosts, ":${rabbit_port}")
+      rabbit_hosts => $rabbit_endpoints,
     }
 
     include ::ironic::cors
-- 
cgit 1.2.3-korg