openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2022-04-05 05:19:53 +00:00 committed by Gerrit Code Review
parent 3802edefbb b442b8d592
commit 5a8fb6d1c9
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
deployment/memcached/memcached-container-puppet.yaml
View File

@ -270,15 +270,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'