From 6462e2e3c37d4778e27c26e1286e905009318aef Mon Sep 17 00:00:00 2001
From: Steven Hardy <shardy@redhat.com>
Date: Thu, 6 Jul 2017 12:29:50 +0100
Subject: 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
---
 manifests/profile/base/nova.pp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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

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) {
-- 
cgit 1.2.3-korg