From 83df0f86120cae36d2a48f23793a45f3f23faa7b Mon Sep 17 00:00:00 2001
From: Ice Yao <yao3690093@gmail.com>
Date: Wed, 20 Jan 2016 15:44:27 +0800
Subject: [PATCH] Add debug option in config file

Config file use *_logging_debug as debug default value

Change-Id: I41102fff9056a82f7307694252adff0aedcf2658
---
 ansible/roles/cinder/templates/cinder.conf.j2          | 2 +-
 ansible/roles/glance/templates/glance-api.conf.j2      | 2 +-
 ansible/roles/glance/templates/glance-registry.conf.j2 | 2 +-
 ansible/roles/heat/templates/heat.conf.j2              | 2 ++
 ansible/roles/magnum/templates/magnum.conf.j2          | 2 +-
 ansible/roles/mistral/templates/mistral.conf.j2        | 2 +-
 ansible/roles/murano/templates/murano.conf.j2          | 2 +-
 ansible/roles/neutron/templates/neutron.conf.j2        | 2 +-
 ansible/roles/nova/templates/nova.conf.j2              | 2 +-
 9 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2
index 95d6aa2ac0..107e190100 100644
--- a/ansible/roles/cinder/templates/cinder.conf.j2
+++ b/ansible/roles/cinder/templates/cinder.conf.j2
@@ -1,5 +1,5 @@
 [DEFAULT]
-debug = true
+debug = {{ cinder_logging_debug }}
 
 use_syslog = True
 syslog_log_facility = LOG_LOCAL0
diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2
index 7dcff91508..afec01b1a3 100644
--- a/ansible/roles/glance/templates/glance-api.conf.j2
+++ b/ansible/roles/glance/templates/glance-api.conf.j2
@@ -1,5 +1,5 @@
 [DEFAULT]
-debug = true
+debug = {{ glance_logging_debug }}
 
 bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
 bind_port = {{ glance_api_port }}
diff --git a/ansible/roles/glance/templates/glance-registry.conf.j2 b/ansible/roles/glance/templates/glance-registry.conf.j2
index a49e945aaa..e3e0d05aa6 100644
--- a/ansible/roles/glance/templates/glance-registry.conf.j2
+++ b/ansible/roles/glance/templates/glance-registry.conf.j2
@@ -1,5 +1,5 @@
 [DEFAULT]
-debug = true
+debug = {{ glance_logging_debug }}
 
 bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
 bind_port = {{ glance_registry_port }}
diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index 27e0162eac..c2faa835fd 100644
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -1,4 +1,6 @@
 [DEFAULT]
+debug = {{ heat_logging_debug }}
+
 heat_watch_server_url = http://{{ kolla_external_address }}:{{ heat_api_cfn_port }}
 heat_metadata_server_url = http://{{ kolla_external_address }}:{{ heat_api_cfn_port }}
 heat_waitcondition_server_url = http://{{ kolla_external_address }}:{{ heat_api_cfn_port }}/v1/waitcondition
diff --git a/ansible/roles/magnum/templates/magnum.conf.j2 b/ansible/roles/magnum/templates/magnum.conf.j2
index b673887c5a..44f9c07ad7 100644
--- a/ansible/roles/magnum/templates/magnum.conf.j2
+++ b/ansible/roles/magnum/templates/magnum.conf.j2
@@ -1,5 +1,5 @@
 [DEFAULT]
-debug = {{ openstack_logging_debug }}
+debug = {{ magnum_logging_debug }}
 
 use_syslog = true
 syslog_log_facility = LOG_LOCAL0
diff --git a/ansible/roles/mistral/templates/mistral.conf.j2 b/ansible/roles/mistral/templates/mistral.conf.j2
index 8ea16abe1d..24781f7ff0 100644
--- a/ansible/roles/mistral/templates/mistral.conf.j2
+++ b/ansible/roles/mistral/templates/mistral.conf.j2
@@ -1,5 +1,5 @@
 [DEFAULT]
-debug = {{ openstack_logging_debug }}
+debug = {{ mistral_logging_debug }}
 
 
 use_syslog = True
diff --git a/ansible/roles/murano/templates/murano.conf.j2 b/ansible/roles/murano/templates/murano.conf.j2
index 3843ecad8c..6af9b47518 100644
--- a/ansible/roles/murano/templates/murano.conf.j2
+++ b/ansible/roles/murano/templates/murano.conf.j2
@@ -1,5 +1,5 @@
 [DEFAULT]
-debug = {{ openstack_logging_debug }}
+debug = {{ murano_logging_debug }}
 
 
 use_syslog = True
diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2
index fb2fdb1b5f..31600efb17 100644
--- a/ansible/roles/neutron/templates/neutron.conf.j2
+++ b/ansible/roles/neutron/templates/neutron.conf.j2
@@ -1,6 +1,6 @@
 # neutron.conf
 [DEFAULT]
-debug = true
+debug = {{ neutron_logging_debug }}
 
 use_syslog = True
 syslog_log_facility = LOG_LOCAL0
diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
index 5d7a02197d..a0a21b4ac4 100644
--- a/ansible/roles/nova/templates/nova.conf.j2
+++ b/ansible/roles/nova/templates/nova.conf.j2
@@ -1,6 +1,6 @@
 # nova.conf
 [DEFAULT]
-debug = true
+debug = {{ nova_logging_debug }}
 
 syslog_log_facility=LOG_LOCAL0
 use_syslog=yes