diff options
author | Steven Hardy <shardy@redhat.com> | 2017-07-06 12:29:50 +0100 |
---|---|---|
committer | Steven Hardy <shardy@redhat.com> | 2017-07-13 09:17:54 +0100 |
commit | 6462e2e3c37d4778e27c26e1286e905009318aef (patch) | |
tree | 20374f984b0dd50cdd0fc230bf287c9629f481f1 /manifests/profile/base/nova.pp | |
parent | dbc3c765e5747a526ef154f0497e136a8c8cdfb4 (diff) |
Remove dependency on memcached_node_ips_v6
This is set via all_nodes_config in t-h-t, but it's a special case for
this service, so it'll be better if we handle the ipv6 transformation
in puppet instead of relying on the service specific list mangling in
t-h-t (one aspect of which has been identified as a potential performance
problem).
Related-Bug: #1684272
Change-Id: Iccb9089db4b382db3adb9340f18f6d2364ca7f58
Diffstat (limited to 'manifests/profile/base/nova.pp')
-rw-r--r-- | manifests/profile/base/nova.pp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp index 16ba7be..eb6856f 100644 --- a/manifests/profile/base/nova.pp +++ b/manifests/profile/base/nova.pp @@ -70,6 +70,9 @@ # (Optional) The current step of the deployment # Defaults to hiera('step') # +# [*memcached_ips*] +# (Optional) Array of ipv4 or ipv6 addresses for memcache. +# Defaults to hiera('memcached_node_ips') class tripleo::profile::base::nova ( $bootstrap_node = hiera('bootstrap_nodeid', undef), @@ -85,6 +88,7 @@ class tripleo::profile::base::nova ( $oslomsg_notify_username = hiera('nova::rabbit_userid', 'guest'), $oslomsg_use_ssl = hiera('nova::rabbit_use_ssl', '0'), $step = Integer(hiera('step')), + $memcached_ips = hiera('memcached_node_ips'), ) { if $::hostname == downcase($bootstrap_node) { @@ -93,10 +97,10 @@ class tripleo::profile::base::nova ( $sync_db = false } - if hiera('nova::use_ipv6', false) { - $memcache_servers = suffix(hiera('memcached_node_ips_v6'), ':11211') + if is_ipv6_address($memcached_ips[0]) { + $memcache_servers = prefix(suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211'), 'inet6:') } else { - $memcache_servers = suffix(hiera('memcached_node_ips'), ':11211') + $memcache_servers = suffix(any2array(normalize_ip_for_uri($memcached_ips)), ':11211') } if $step >= 4 or ($step >= 3 and $sync_db) { |