aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/keystone.pp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-08 18:00:24 +0000
committerGerrit Code Review <review@openstack.org>2016-11-08 18:00:24 +0000
commit570aa806acff2a863b476828fc943882635eb41d (patch)
tree73c5113510fe472d4778c11a53f7e267481b8990 /manifests/profile/base/keystone.pp
parentc326036cfc3945a410d1f16d005d1b84f28ac83a (diff)
parent274156e5bab7a6c252d9c13015a1d4d14801e770 (diff)
Merge "Add proper handling of IPv6 addresses for rabbit host/port handling"
Diffstat (limited to 'manifests/profile/base/keystone.pp')
-rw-r--r--manifests/profile/base/keystone.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index e30f712..9801eb2 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -143,10 +143,11 @@ class tripleo::profile::base::keystone (
}
if $step >= 4 or ( $step >= 3 and $sync_db ) {
+ $rabbit_endpoints = suffix(any2array(normalize_ip_for_uri($rabbit_hosts)), ":${rabbit_port}")
class { '::keystone':
sync_db => $sync_db,
enable_bootstrap => $sync_db,
- rabbit_hosts => suffix($rabbit_hosts, ":${rabbit_port}")
+ rabbit_hosts => $rabbit_endpoints,
}
include ::keystone::config