Merge "Fix logic to honor HorizonDebug" into stable/train

deployment/horizon/horizon-container-puppet.yaml

@@ -44,7 +44,7 @@ parameters:
     description: Set to True to enable debugging on all services.
     type: boolean
   HorizonDebug:
-    default: false
+    default: ''
     description: Set to True to enable debugging Horizon service.
     type: string
     constraints:
@@ -136,17 +136,21 @@ parameters:
       file: /var/log/containers/horizon/horizon.log
 
 conditions:
-  debug_unset: {equals : [{get_param: Debug}, '']}
+  service_debug_unset: {equals : [{get_param: HorizonDebug}, '']}
   websso_enabled: {equals : [{get_param: WebSSOEnable}, True]}
   internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
   horizon_logger_debug:
     or:
-    - yaql:
+      - and:
-        expression: $.data.horizon_debug.matches("true|True|TRUE")
+          - service_debug_unset
-        data:
+          - get_param: Debug
-          horizon_debug:
+      - and:
-            get_param: HorizonDebug
+          - not: service_debug_unset
-    - get_param: Debug
+          - yaql:
+              expression: $.data.horizon_debug.matches("true|True|TRUE")
+              data:
+                horizon_debug:
+                  get_param: HorizonDebug
 
 resources:
 
@@ -219,9 +223,9 @@ outputs:
           - {}
         -
           if:
-          - debug_unset
+          - service_debug_unset
-          - horizon::django_debug: { get_param: HorizonDebug }
           - horizon::django_debug: { get_param: Debug }
+          - horizon::django_debug: { get_param: HorizonDebug }
         - if:
           - horizon_logger_debug
           - horizon::log_level: 'DEBUG'