From 22da29c2bef8c8c4262867a36b51210df7a481fc Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Thu, 29 Jun 2017 07:10:20 -0500
Subject: [PATCH] Logging: Disable debug logging by default

This PS disables debug logging for all services that had it on, and
removes the key from the default values.yaml. It does however ensure
that the mvp values has the appropriate key to make turning debugging
on simple.

Change-Id: I8ed84d531971cbd7984f029abbebb373af4c7311
---
 cinder/values.yaml               | 1 -
 glance/values.yaml               | 3 ---
 tools/overrides/mvp/cinder.yaml  | 4 +++-
 tools/overrides/mvp/glance.yaml  | 4 ++++
 tools/overrides/mvp/neutron.yaml | 2 +-
 tools/overrides/mvp/nova.yaml    | 2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/cinder/values.yaml b/cinder/values.yaml
index 8c0d6107bf..b42e4aeb0d 100644
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@@ -109,7 +109,6 @@ conf:
     default:
       oslo:
         log:
-          debug: false
           use_syslog: false
           use_stderr: true
       cinder:
diff --git a/glance/values.yaml b/glance/values.yaml
index 0cac1b2fbd..e5ed078bee 100644
--- a/glance/values.yaml
+++ b/glance/values.yaml
@@ -112,9 +112,6 @@ conf:
     override:
     append:
     default:
-      oslo:
-        log:
-          debug: true
       glance:
         api:
           bind_port: 9292
diff --git a/tools/overrides/mvp/cinder.yaml b/tools/overrides/mvp/cinder.yaml
index bc44c55300..86039fa218 100644
--- a/tools/overrides/mvp/cinder.yaml
+++ b/tools/overrides/mvp/cinder.yaml
@@ -22,9 +22,11 @@ storage: "gate"
 conf:
   cinder:
     default:
+      oslo:
+        log:
+          debug: false
       cinder:
         backup_driver: "cinder.backup.drivers.nfs"
   backends:
     rbd1:
       volume_driver: "cinder.volume.drivers.nfs.NfsDriver"
-
diff --git a/tools/overrides/mvp/glance.yaml b/tools/overrides/mvp/glance.yaml
index 215e672f06..2ba89cc3ca 100644
--- a/tools/overrides/mvp/glance.yaml
+++ b/tools/overrides/mvp/glance.yaml
@@ -21,6 +21,10 @@ storage: pvc
 
 conf:
   glance:
+    default:
+      oslo:
+        log:
+          debug: false
     glance_store:
       glance:
         store:
diff --git a/tools/overrides/mvp/neutron.yaml b/tools/overrides/mvp/neutron.yaml
index ccfc5b308a..da443bbc17 100644
--- a/tools/overrides/mvp/neutron.yaml
+++ b/tools/overrides/mvp/neutron.yaml
@@ -26,7 +26,7 @@ conf:
     default:
       oslo:
         log:
-          debug: true
+          debug: false
       neutron:
         db:
           l3_ha: False
diff --git a/tools/overrides/mvp/nova.yaml b/tools/overrides/mvp/nova.yaml
index 80e8f3a462..da6983008d 100644
--- a/tools/overrides/mvp/nova.yaml
+++ b/tools/overrides/mvp/nova.yaml
@@ -20,7 +20,7 @@ conf:
     default:
       oslo:
         log:
-          debug: true
+          debug: false
     libvirt:
       nova:
         conf: