Merge "Make memcache also listen to localhost" into stable/train
This commit is contained in:
commit
be02f0ec40
|
@ -79,6 +79,10 @@ conditions:
|
||||||
- equals: [{get_param: MemcachedDebug}, 'true']
|
- equals: [{get_param: MemcachedDebug}, 'true']
|
||||||
- equals: [{get_param: MemcachedDebug}, 'True']
|
- equals: [{get_param: MemcachedDebug}, 'True']
|
||||||
- equals: [{get_param: Debug}, true]
|
- equals: [{get_param: Debug}, true]
|
||||||
|
is_ipv6:
|
||||||
|
equals:
|
||||||
|
- {get_param: [ServiceData, net_ip_version_map, {get_param: [ServiceNetMap, MemcachedNetwork]}]}
|
||||||
|
- 6
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
|
|
||||||
|
@ -100,13 +104,21 @@ outputs:
|
||||||
# internal_api_uri -> [IP]
|
# internal_api_uri -> [IP]
|
||||||
# internal_api_subnet - > IP/CIDR
|
# internal_api_subnet - > IP/CIDR
|
||||||
memcached::listen_ip:
|
memcached::listen_ip:
|
||||||
str_replace:
|
- if:
|
||||||
|
- is_ipv6
|
||||||
|
- '::1'
|
||||||
|
- '127.0.0.1'
|
||||||
|
- str_replace:
|
||||||
template:
|
template:
|
||||||
"%{hiera('$NETWORK')}"
|
"%{hiera('$NETWORK')}"
|
||||||
params:
|
params:
|
||||||
$NETWORK: {get_param: [ServiceNetMap, MemcachedNetwork]}
|
$NETWORK: {get_param: [ServiceNetMap, MemcachedNetwork]}
|
||||||
memcached::listen_ip_uri:
|
memcached::listen_ip_uri:
|
||||||
str_replace:
|
- if:
|
||||||
|
- is_ipv6
|
||||||
|
- '::1'
|
||||||
|
- '127.0.0.1'
|
||||||
|
- str_replace:
|
||||||
template:
|
template:
|
||||||
"%{hiera('$NETWORK_uri')}"
|
"%{hiera('$NETWORK_uri')}"
|
||||||
params:
|
params:
|
||||||
|
|
Loading…
Reference in New Issue