Merge "Memcached: Allow puppet to be aware IPv6 is used" into stable/…

…ussuri
openstack-archive · Mar 31, 2022 · 232f179 · 232f179
2 parents 13015db + 5a349d4
commit 232f179
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/deployment/memcached/memcached-container-puppet.yaml b/deployment/memcached/memcached-container-puppet.yaml
@@ -254,15 +254,22 @@ outputs:
                     - 11211
                     - {get_param: MemcachedPort}
       global_config_settings:
-        # NOTE: This config is necessary while there are still services
-        # consuming Memcached that do not support TLS. Once all services
-        # do support TLS, this config should be dropped.
-        if:
-        - enable_non_tls_port
-        - memcached_port: {get_param: MemcachedPort}
-          memcached_authtoken_port: 11211
-        - memcached_port: {get_param: MemcachedPort}
-          memcached_authtoken_port: {get_param: MemcachedPort}
+        map_merge:
+          -
+            # NOTE: This config is necessary while there are still services
+            # consuming Memcached that do not support TLS. Once all services
+            # do support TLS, this config should be dropped.
+            if:
+              - enable_non_tls_port
+              - memcached_port: {get_param: MemcachedPort}
+                memcached_authtoken_port: 11211
+              - memcached_port: {get_param: MemcachedPort}
+                memcached_authtoken_port: {get_param: MemcachedPort}
+          -
+            if:
+              - is_ipv6
+              - memcached_ipv6: true
+              - {}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: 'memcached'