aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/heat-base.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-07 17:56:32 +0000
committerGerrit Code Review <review@openstack.org>2017-06-07 17:56:32 +0000
commit2518394c2f45d5514946de962f8dfd13aa7c7377 (patch)
tree9127d739f7e4455fd572aa50ae28c60df1410039 /puppet/services/heat-base.yaml
parent671db66b9c18a809dbdbabbf48823754a2402bcf (diff)
parent1e899703ccc33a9b24c4b0997b04cee1df37575d (diff)
Merge "Ability to enable/disable debug mode per OpenStack service"
Diffstat (limited to 'puppet/services/heat-base.yaml')
-rw-r--r--puppet/services/heat-base.yaml13
1 files changed, 12 insertions, 1 deletions
diff --git a/puppet/services/heat-base.yaml b/puppet/services/heat-base.yaml
index dfd823db..d89fe46a 100644
--- a/puppet/services/heat-base.yaml
+++ b/puppet/services/heat-base.yaml
@@ -8,6 +8,10 @@ parameters:
default: ''
description: Set to True to enable debugging on all services.
type: string
+ HeatDebug:
+ default: ''
+ description: Set to True to enable debugging Heat services.
+ type: string
RabbitPassword:
description: The password for RabbitMQ
type: string
@@ -112,6 +116,9 @@ parameters:
description: Maximum raw byte size of the Heat API JSON request body.
type: number
+conditions:
+ service_debug_unset: {equals : [{get_param: HeatDebug}, '']}
+
outputs:
role_data:
description: Shared role data for the Heat services.
@@ -122,7 +129,11 @@ outputs:
heat::rabbit_password: {get_param: RabbitPassword}
heat::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
heat::rabbit_port: {get_param: RabbitClientPort}
- heat::debug: {get_param: Debug}
+ heat::debug:
+ if:
+ - service_debug_unset
+ - {get_param: Debug }
+ - {get_param: HeatDebug }
heat::enable_proxy_headers_parsing: true
heat::rpc_response_timeout: 600
# We need this because the default heat policy.json no longer works on TripleO