From 812aa726ef897e624f49edac88171d1645fec072 Mon Sep 17 00:00:00 2001
From: Keigo Noha <knoha@redhat.com>
Date: Tue, 28 Jul 2020 10:41:12 +0900
Subject: [PATCH] Set 'DEBUG' to horizon::log_level if HorizonDebug or Debug is
 true

Previously, if HorzionDebug of Debug was true, horizon::django_debug
was set to True. However, those parameters didn't change the logger
level of horizon components. By this change, when HorizonDebug or
Debug is True, horizon::log_level is set to 'DEBUG'.

Change-Id: I0a140682c552ba8a4e943124330852259e66142d
---
 deployment/horizon/horizon-container-puppet.yaml     | 12 ++++++++++++
 .../notes/horizon_logger_debug-cd70c45c1b695e4b.yaml |  8 ++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 releasenotes/notes/horizon_logger_debug-cd70c45c1b695e4b.yaml

diff --git a/deployment/horizon/horizon-container-puppet.yaml b/deployment/horizon/horizon-container-puppet.yaml
index c72683e1ed..216b962ef4 100644
--- a/deployment/horizon/horizon-container-puppet.yaml
+++ b/deployment/horizon/horizon-container-puppet.yaml
@@ -153,6 +153,14 @@ conditions:
     equals:
       - {get_param: [ServiceData, net_ip_version_map, {get_param: [ServiceNetMap, HorizonNetwork]}]}
       - 6
+  horizon_logger_debug:
+    or:
+    - yaql:
+        expression: $.data.horizon_debug.matches("true|True|TRUE")
+        data:
+          horizon_debug:
+            get_param: HorizonDebug
+    - get_param: Debug
 
 resources:
 
@@ -228,6 +236,10 @@ outputs:
           - debug_unset
           - horizon::django_debug: { get_param: HorizonDebug }
           - horizon::django_debug: { get_param: Debug }
+        - if:
+          - horizon_logger_debug
+          - horizon::log_level: 'DEBUG'
+          - {}
         - if:
           - horizon_domain_choices_set
           - horizon::keystone_domain_choices: {get_param: HorizonDomainChoices}
diff --git a/releasenotes/notes/horizon_logger_debug-cd70c45c1b695e4b.yaml b/releasenotes/notes/horizon_logger_debug-cd70c45c1b695e4b.yaml
new file mode 100644
index 0000000000..bb38b7b33d
--- /dev/null
+++ b/releasenotes/notes/horizon_logger_debug-cd70c45c1b695e4b.yaml
@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    Previously, HorizonDebug and Debug parameters change the value of
+    horizon::django_debug. However, those parameters didn't set DEBUG
+    log level to horizon logger components.
+    By this change, if those are true, horizon::log_level is set to
+    'DEBUG'.