[openstack-glance/el6-havana] Do not log DEBUG by default

[John Bresnahan]

commit e6b5b3576a206322217739015c232fe625d25eb0
Author: John Bresnahan <jbresnah at redhat.com>
Date:   Tue Jul 23 09:53:54 2013 -1000

    Do not log DEBUG by default
    
    rhbz#979734

 openstack-glance-api.init      |    2 +-
 openstack-glance-registry.init |    2 +-
 openstack-glance-scrubber.init |    2 +-
 openstack-glance.spec          |    9 ++++++++-
 4 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/openstack-glance-api.init b/openstack-glance-api.init
index 549b63d..8a875d2 100644
--- a/openstack-glance-api.init
+++ b/openstack-glance-api.init
@@ -30,7 +30,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user glance --pidfile $pidfile "$exec --config-file $config --debug --verbose &>/dev/null & echo \$! > $pidfile"
+    daemon --user glance --pidfile $pidfile "$exec --config-file $config &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/openstack-glance-registry.init b/openstack-glance-registry.init
index 48bab47..4d5cfa4 100644
--- a/openstack-glance-registry.init
+++ b/openstack-glance-registry.init
@@ -30,7 +30,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user glance --pidfile $pidfile "$exec --config-file $config --debug --verbose &>/dev/null & echo \$! > $pidfile"
+    daemon --user glance --pidfile $pidfile "$exec --config-file $config &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/openstack-glance-scrubber.init b/openstack-glance-scrubber.init
index 09c1e0b..bc1f706 100644
--- a/openstack-glance-scrubber.init
+++ b/openstack-glance-scrubber.init
@@ -30,7 +30,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $user_config ] || exit 7
     echo -n $"Starting $prog: "
-    daemon --user glance --pidfile $pidfile "$exec --daemon --config-file $user_config --verbose &>/dev/null & echo \$! > $pidfile"
+    daemon --user glance --pidfile $pidfile "$exec --daemon --config-file $user_config &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/openstack-glance.spec b/openstack-glance.spec
index fcfd50e..4377332 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,6 +1,6 @@
 Name:             openstack-glance
 Version:          2013.2
-Release:          0.5.b2%{?dist}
+Release:          0.6.b2%{?dist}
 Summary:          OpenStack Image Service
 
 Group:            Applications/System
@@ -127,6 +127,13 @@ rm -rf {test-,}requirements.txt tools/{pip,test}-requires
 %build
 
 # Change the default config
+openstack-config --set etc/glance-api.conf DEFAULT debug False
+openstack-config --set etc/glance-api.conf DEFAULT verbose True
+openstack-config --set etc/glance-registry.conf DEFAULT debug False
+openstack-config --set etc/glance-registry.conf DEFAULT verbose True
+openstack-config --set etc/glance-scrubber.conf DEFAULT debug False
+openstack-config --set etc/glance-scrubber.conf DEFAULT verbose True
+
 openstack-config --set etc/glance-registry.conf DEFAULT sql_connection mysql://glance:glance@localhost/glance
 openstack-config --set etc/glance-api.conf DEFAULT sql_connection mysql://glance:glance@localhost/glance
 # Move authtoken configuration out of paste.ini