openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove redundant usage of hieradata"

This commit is contained in:
Zuul 2022-06-09 23:26:11 +00:00 committed by Gerrit Code Review
parent 1bb52f8122 0b9d3bf777
commit 73cb852eb6
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,16 +199,6 @@ outputs:
- is_ipv6
- 'notls:[::1]:11211'
- 'notls:127.0.0.1:11211'
memcached::listen_ip_uri:
- if:
- is_ipv6
- '::1'
- '127.0.0.1'
- str_replace:
template:
"%{lookup('$NETWORK_uri')}"
params:
$NETWORK: {get_param: [ServiceNetMap, MemcachedNetwork]}
memcached::tcp_port: {get_param: MemcachedPort}
memcached::max_connections: {get_param: MemcachedMaxConnections}
memcached::max_memory: {get_param: MemcachedMaxMemory}
@ -238,7 +228,16 @@ outputs:
- memcached
collectd::plugin::memcached::instances:
local:
host: "%{lookup('memcached::listen_ip_uri')}"
host:
- if:
- is_ipv6
- '::1'
- '127.0.0.1'
- str_replace:
template:
"%{lookup('$NETWORK_uri')}"
params:
$NETWORK: {get_param: [ServiceNetMap, MemcachedNetwork]}
port: # collectd has no support to Memcached+TLS yet.
- if:
- enable_non_tls_port