diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-06-07 17:56:32 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-06-07 17:56:32 +0000 |
commit | 2518394c2f45d5514946de962f8dfd13aa7c7377 (patch) | |
tree | 9127d739f7e4455fd572aa50ae28c60df1410039 /puppet/services/manila-base.yaml | |
parent | 671db66b9c18a809dbdbabbf48823754a2402bcf (diff) | |
parent | 1e899703ccc33a9b24c4b0997b04cee1df37575d (diff) |
Merge "Ability to enable/disable debug mode per OpenStack service"
Diffstat (limited to 'puppet/services/manila-base.yaml')
-rw-r--r-- | puppet/services/manila-base.yaml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/puppet/services/manila-base.yaml b/puppet/services/manila-base.yaml index a299fffa..d0ee2125 100644 --- a/puppet/services/manila-base.yaml +++ b/puppet/services/manila-base.yaml @@ -30,6 +30,10 @@ parameters: default: '' description: Set to True to enable debugging on all services. type: string + ManilaDebug: + default: '' + description: Set to True to enable debugging Manila services. + type: string RabbitPassword: description: The password for RabbitMQ type: string @@ -53,6 +57,9 @@ parameters: type: string hidden: true +conditions: + service_debug_unset: {equals : [{get_param: ManilaDebug}, '']} + outputs: role_data: description: Role data for the Manila Base service. @@ -63,7 +70,11 @@ outputs: manila::rabbit_password: {get_param: RabbitPassword} manila::rabbit_use_ssl: {get_param: RabbitClientUseSSL} manila::rabbit_port: {get_param: RabbitClientPort} - manila::debug: {get_param: Debug} + manila::debug: + if: + - service_debug_unset + - {get_param: Debug } + - {get_param: ManilaDebug } manila::db::database_db_max_retries: -1 manila::db::database_max_retries: -1 manila::sql_connection: |