Fix logic to honor HorizonDebug
Debug always has one of true/false and is always set. We should check
whether HorizonDebug is set instead of whether Debug is set.
Also, this change fixes the current logic to make sure that
HorizonDebug: false is honored even when Debug: true is set.
Closes-Bug: #1908362
Change-Id: I514b5a3d4133d3561376ea06a803d019acaa0f0b
(cherry picked from commit f89140402e
)
This commit is contained in:
parent
870ed10ef2
commit
bb7d59c65a
|
@ -41,7 +41,7 @@ parameters:
|
||||||
description: Set to True to enable debugging on all services.
|
description: Set to True to enable debugging on all services.
|
||||||
type: boolean
|
type: boolean
|
||||||
HorizonDebug:
|
HorizonDebug:
|
||||||
default: false
|
default: ''
|
||||||
description: Set to True to enable debugging Horizon service.
|
description: Set to True to enable debugging Horizon service.
|
||||||
type: string
|
type: string
|
||||||
constraints:
|
constraints:
|
||||||
|
@ -154,7 +154,7 @@ parameter_groups:
|
||||||
- MemcachedIPv6
|
- MemcachedIPv6
|
||||||
|
|
||||||
conditions:
|
conditions:
|
||||||
debug_unset: {equals : [{get_param: Debug}, '']}
|
service_debug_unset: {equals : [{get_param: HorizonDebug}, '']}
|
||||||
websso_enabled: {equals : [{get_param: WebSSOEnable}, True]}
|
websso_enabled: {equals : [{get_param: WebSSOEnable}, True]}
|
||||||
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
|
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
|
||||||
horizon_domain_choices_set: {not: {equals: [{get_param: HorizonDomainChoices}, []]}}
|
horizon_domain_choices_set: {not: {equals: [{get_param: HorizonDomainChoices}, []]}}
|
||||||
|
@ -164,12 +164,16 @@ conditions:
|
||||||
- 6
|
- 6
|
||||||
horizon_logger_debug:
|
horizon_logger_debug:
|
||||||
or:
|
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:
|
resources:
|
||||||
|
|
||||||
|
@ -248,9 +252,9 @@ outputs:
|
||||||
- {}
|
- {}
|
||||||
-
|
-
|
||||||
if:
|
if:
|
||||||
- debug_unset
|
- service_debug_unset
|
||||||
- horizon::django_debug: { get_param: HorizonDebug }
|
|
||||||
- horizon::django_debug: { get_param: Debug }
|
- horizon::django_debug: { get_param: Debug }
|
||||||
|
- horizon::django_debug: { get_param: HorizonDebug }
|
||||||
- if:
|
- if:
|
||||||
- horizon_logger_debug
|
- horizon_logger_debug
|
||||||
- horizon::log_level: 'DEBUG'
|
- horizon::log_level: 'DEBUG'
|
||||||
|
|
Loading…
Reference in New Issue