From 07b3ff19efeb0a45ca702e956ebc6c040f33102b Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Fri, 20 May 2022 09:14:20 +0900
Subject: [PATCH] Train-only: Use tht parameter to detect IPv6 usage for
 memcached

net_ip_version_map does not present in stable/train and we should use
the tht parameter to detect usage of IPv6.

This patch is directly submitted to stable/train because the parameter
was deprecated during Ussuri cycle and has no effect in Victoria.

Related-Bug: #1964824
Change-Id: I012954f93bb5bf9c76bc5d77f99ef8d0db434add
---
 .../memcached/memcached-container-puppet.yaml  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/deployment/memcached/memcached-container-puppet.yaml b/deployment/memcached/memcached-container-puppet.yaml
index 2cc5afcfbe..9ae0553b07 100644
--- a/deployment/memcached/memcached-container-puppet.yaml
+++ b/deployment/memcached/memcached-container-puppet.yaml
@@ -80,6 +80,10 @@ parameters:
                  port set with MemcachedPort parameter (above) and on 11211,
                  without TLS.
     type: boolean
+  MemcachedIPv6:
+    default: false
+    description: Enable IPv6 features in Memcached.
+    type: boolean
 
 conditions:
   internal_tls_enabled: {get_param: MemcachedTLS}
@@ -96,10 +100,6 @@ conditions:
       - equals: [{get_param: MemcachedDebug}, 'true']
       - equals: [{get_param: MemcachedDebug}, 'True']
       - equals: [{get_param: Debug}, true]
-  is_ipv6:
-    equals:
-      - {get_param: [ServiceData, net_ip_version_map, {get_param: [ServiceNetMap, MemcachedNetwork]}]}
-      - 6
 
 resources:
 
@@ -123,7 +123,7 @@ outputs:
             memcached::listen:
               list_concat:
                 - - if:
-                    - is_ipv6
+                    - {get_param: MemcachedIPv6}
                     - '::1'
                     - '127.0.0.1'
                   - str_replace:
@@ -139,7 +139,7 @@ outputs:
                         params:
                           $NETWORK: {get_param: [ServiceNetMap, MemcachedNetwork]}
                     - if:
-                      - is_ipv6
+                      - {get_param: MemcachedIPv6}
                       - 'notls:[::1]:11211'
                       - 'notls:127.0.0.1:11211'
                   - []
@@ -149,7 +149,7 @@ outputs:
             # see: https://github.com/saz/puppet-memcached/pull/127
             memcached::listen_ip:
               - if:
-                - is_ipv6
+                - {get_param: MemcachedIPv6}
                 - '::1'
                 - '127.0.0.1'
               - str_replace:
@@ -159,7 +159,7 @@ outputs:
                     $NETWORK: {get_param: [ServiceNetMap, MemcachedNetwork]}
             memcached::listen_ip_uri:
               - if:
-                - is_ipv6
+                - {get_param: MemcachedIPv6}
                 - '::1'
                 - '127.0.0.1'
               - str_replace:
@@ -267,7 +267,7 @@ outputs:
                 memcached_authtoken_port: {get_param: MemcachedPort}
           -
             if:
-              - is_ipv6
+              - {get_param: MemcachedIPv6}
               - memcached_ipv6: true
               - {}
       # BEGIN DOCKER SETTINGS