openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix parameters for puppet-memcached-6.0.0"

This commit is contained in:
Zuul 2021-03-16 12:47:25 +00:00 committed by Gerrit Code Review
parent 4c056e2429 9be84a2fc2
commit 0626405b0d
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,7 +165,7 @@ outputs:
# internal_api -> IP
# internal_api_uri -> [IP]
# internal_api_subnet - > IP/CIDR
memcached::listen_addr:
memcached::listen:
list_concat:
- - if:
- is_ipv6
@ -189,9 +189,8 @@ outputs:
- 'notls:127.0.0.1:11211'
- []
# NOTE(xek): the IP addresses are configured with:
# memcached::listen_addr - the new way
# memcached::listen - the new way
# memcached::listen_ip - will be deprecated
# memcached::notls_listener_port/addr - will be deprecated
# see: https://github.com/saz/puppet-memcached/pull/127
memcached::listen_ip:
- if:
@ -236,14 +235,7 @@ outputs:
# do support TLS, this config should be dropped.
if:
- enable_non_tls_port
- memcached::notls_listener_port: 11211
memcached::notls_listener_addr:
str_replace:
template:
"%{hiera('$NETWORK_uri')}"
params:
$NETWORK: {get_param: [ServiceNetMap, MemcachedNetwork]}
memcached_port: {get_param: MemcachedPort}
- memcached_port: {get_param: MemcachedPort}
memcached_authtoken_port: 11211
- memcached_port: {get_param: MemcachedPort}
memcached_authtoken_port: {get_param: MemcachedPort}