openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Enable debug of memcached when Debug is enabled 

This restores the previous behavior changed by recent refactoring about
the *Debug parameters, and ensures that the global Debug parameter also
affects memcached logging.

Closes-Bug: #1940303
Change-Id: I5b8c71793476dd7673015928254d8fa8b499351d
(cherry picked from commit 073e581e62)
This commit is contained in:
Takashi Kajinami 2021-08-17 23:18:45 +09:00
parent c9513a5ac9
commit a975b1167d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,7 +96,10 @@ conditions:
- not: {equals: [{get_param: MemcachedPort}, 11211]} - not: {equals: [{get_param: MemcachedPort}, 11211]}
memcached_network_set: memcached_network_set:
not: {equals : [{get_param: MemcachedIpSubnet}, '']} not: {equals : [{get_param: MemcachedIpSubnet}, '']}
service_debug: {get_param: MemcachedDebug} memcached_debug:
or:
- {get_param: Debug}
- {get_param: MemcachedDebug}
is_ipv6: is_ipv6:
equals: equals:
- {get_param: [ServiceData, net_ip_version_map, {get_param: [ServiceNetMap, MemcachedNetwork]}]} - {get_param: [ServiceData, net_ip_version_map, {get_param: [ServiceNetMap, MemcachedNetwork]}]}
@ -213,7 +216,7 @@ outputs:
- '' - ''
- - 'v' - - 'v'
- if: - if:
- service_debug - memcached_debug
- 'v' - 'v'
- '' - ''
memcached::disable_cachedump: true memcached::disable_cachedump: true