aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2016-09-19 15:43:46 -0400
committerEmilien Macchi <emilien@redhat.com>2016-09-20 15:21:47 +0000
commit494b9dfe952a47ac4dcc21acdec6c0adacf59a8b (patch)
treea657a6960391e70f4ce1f83963e59579ecf2f821 /manifests/profile/base
parent6a9429eeda549f85fdb7e3748188046d702852fb (diff)
swift: normalize memcache servers IP addresses
In the case of memcache servers are IPv6, make sure brackets set in the way we construct the list of memcache server + memcache port parameter. Also add unit-tests to test that the output is what we want in the configuration. Depends-On: I8d361ce9cfcfe6a3f8592b2b7991971a3c748c75 Closes-Bug: 1625335 Change-Id: I9fb8168d8fb56c9d8465d58a45fd8c6edfee6fdd
Diffstat (limited to 'manifests/profile/base')
-rw-r--r--manifests/profile/base/swift/proxy.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp
index a95d05f..9d50462 100644
--- a/manifests/profile/base/swift/proxy.pp
+++ b/manifests/profile/base/swift/proxy.pp
@@ -37,7 +37,7 @@ class tripleo::profile::base::swift::proxy (
$memcache_port = 11211,
) {
if $step >= 4 {
- $swift_memcache_servers = suffix($memcache_servers, ":${memcache_port}")
+ $swift_memcache_servers = suffix(any2array(normalize_ip_for_uri($memcache_servers)), ":${memcache_port}")
include ::swift::proxy
include ::swift::proxy::proxy_logging
include ::swift::proxy::healthcheck