From a975b1167ddeae5ac47f631c0464ecca5c1de6b4 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 17 Aug 2021 23:18:45 +0900
Subject: [PATCH] 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 073e581e62b961ce1e4871e74c9717dd34673c8c)
---
 deployment/memcached/memcached-container-puppet.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/deployment/memcached/memcached-container-puppet.yaml b/deployment/memcached/memcached-container-puppet.yaml
index a134703b2d..bff19e5268 100644
--- a/deployment/memcached/memcached-container-puppet.yaml
+++ b/deployment/memcached/memcached-container-puppet.yaml
@@ -96,7 +96,10 @@ conditions:
       - not: {equals: [{get_param: MemcachedPort}, 11211]}
   memcached_network_set:
     not: {equals : [{get_param: MemcachedIpSubnet}, '']}
-  service_debug: {get_param: MemcachedDebug}
+  memcached_debug:
+    or:
+      - {get_param: Debug}
+      - {get_param: MemcachedDebug}
   is_ipv6:
     equals:
       - {get_param: [ServiceData, net_ip_version_map, {get_param: [ServiceNetMap, MemcachedNetwork]}]}
@@ -213,7 +216,7 @@ outputs:
                 - ''
                 - - 'v'
                   - if:
-                    - service_debug
+                    - memcached_debug
                     - 'v'
                     - ''
             memcached::disable_cachedump: true