From dc29257c22c86ce730420f82a5190b84cfdd0004 Mon Sep 17 00:00:00 2001
From: Vu Tran <vu.tran@windriver.com>
Date: Wed, 14 May 2014 16:08:41 -0400
Subject: cinder: ensure log-dir is set correctly

Make sure all Cinder services have the right setting
for log_dir in the init script as well as in the
config setting in .conf file as we shouldn't only
count on our init script launch to get logging right.

Signed-off-by: Vu Tran <vu.tran@windriver.com>
---
 meta-openstack/recipes-devtools/python/python-cinder/cinder-volume | 3 ++-
 meta-openstack/recipes-devtools/python/python-cinder/cinder.conf   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'meta-openstack/recipes-devtools/python')

diff --git a/meta-openstack/recipes-devtools/python/python-cinder/cinder-volume b/meta-openstack/recipes-devtools/python/python-cinder/cinder-volume
index 2c9334e..aec6ab0 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder/cinder-volume
+++ b/meta-openstack/recipes-devtools/python/python-cinder/cinder-volume
@@ -35,7 +35,8 @@ start()
     echo -n "Starting $DESC..."
 
     start-stop-daemon --start --quiet --background \
-        --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON}
+        --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} \
+        -- --log-dir=/var/log/cinder
 
     if [ $? -eq 0 ]; then
         echo "done."
diff --git a/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf b/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf
index 80adfe4..2772fb1 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf
+++ b/meta-openstack/recipes-devtools/python/python-cinder/cinder.conf
@@ -49,7 +49,7 @@ rabbit_port=5672
 
 # (Optional) The directory to keep log files in (will be
 # prepended to --log-file) (string value)
-#log_dir=<None>
+log_dir=/var/log/cinder
 
 # Use syslog for logging. (boolean value)
 #use_syslog=false
-- 
cgit v1.2.3-54-g00ecf