Merge "Set 'DEBUG' to horizon::log_level if HorizonDebug or Debug is …

…true" into stable/ussuri
openstack-archive · Mar 11, 2021 · 9e3af44 · 9e3af44
2 parents 87415f4 + 0502fb1
commit 9e3af44
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/deployment/horizon/horizon-container-puppet.yaml b/deployment/horizon/horizon-container-puppet.yaml
@@ -158,6 +158,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:
 
@@ -233,6 +241,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
@@ -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'.