aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/heat.pp
diff options
context:
space:
mode:
authorBrent Eagles <beagles@redhat.com>2016-11-08 01:02:29 -0330
committerBrent Eagles <beagles@redhat.com>2016-11-08 01:51:27 -0330
commit274156e5bab7a6c252d9c13015a1d4d14801e770 (patch)
tree4d063c5f506ab4b69ec7f2eb40c58972d2a01852 /manifests/profile/base/heat.pp
parent8a4fc9c18e8ebfccc7f5bd0c4820c87bebd61d31 (diff)
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
Diffstat (limited to 'manifests/profile/base/heat.pp')
-rw-r--r--manifests/profile/base/heat.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp
index 2babf4c..00a9809 100644
--- a/manifests/profile/base/heat.pp
+++ b/manifests/profile/base/heat.pp
@@ -62,9 +62,10 @@ class tripleo::profile::base::heat (
}
if $step >= 4 {
+ $rabbit_endpoints = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}")
class { '::heat' :
notification_driver => $notification_driver,
- rabbit_hosts => suffix($rabbit_hosts, ":${rabbit_port}")
+ rabbit_hosts => $rabbit_endpoints,
}
include ::heat::config
include ::heat::cors