OpenStack: sysvinit scripts - enable logging

Explicitly enable --log-dir to enable logging where available

Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

3 files changed, 18 insertions, 7 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova-all b/meta-openstack/recipes-devtools/python/python-nova/nova-all
index b3ff40e..c1d537d 100644
--- a/meta-openstack/recipes-devtools/python/python-nova/nova-all
+++ b/meta-openstack/recipes-devtools/python/python-nova/nova-all
@@ -29,10 +29,15 @@ start ()
         fi
     fi
 
+    if [ ! -d /var/log/nova ]; then
+        mkdir /var/log/nova
+    fi
+
     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/nova
 
     if [ $? -eq 0 ]; then
         echo "done."
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova-consoleauth b/meta-openstack/recipes-devtools/python/python-nova/nova-consoleauth
index 59c6cee..99f04d5 100644
--- a/meta-openstack/recipes-devtools/python/python-nova/nova-consoleauth
+++ b/meta-openstack/recipes-devtools/python/python-nova/nova-consoleauth
@@ -16,7 +16,7 @@
 set -e
 
 DAEMON=/usr/bin/nova-consoleauth
-DAEMON_ARGS=""
+DAEMON_ARGS="--log-dir=/var/log/nova "                                              
 PIDFILE=/var/run/nova/nova-consoleauth.pid
 
 ENABLED=true
@@ -76,9 +76,12 @@ case "$1" in
         chown nova $PIDDIR
     fi
 
+    if [ ! -d /var/log/nova ]; then
+        mkdir /var/log/nova
+    fi
+
     echo "Starting nova console" "nova-consoleauth"
-    sudo -u nova \
-        start-stop-daemon --start -b -m --pidfile $PIDFILE \
+    start-stop-daemon --start -b -m --pidfile $PIDFILE \
         --exec ${DAEMON} -- ${DAEMON_ARGS}
     log_end_msg $?
     ;;
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova.init b/meta-openstack/recipes-devtools/python/python-nova/nova.init
index 5917882..87e72fa 100644
--- a/meta-openstack/recipes-devtools/python/python-nova/nova.init
+++ b/meta-openstack/recipes-devtools/python/python-nova/nova.init
@@ -46,11 +46,14 @@ start ()
         mkdir -p $PIDDIR
         chown nova $PIDDIR
     fi
+    if [ ! -d /var/log/nova ]; then
+        mkdir /var/log/nova
+    fi
     echo -n "Starting $DESC..."
 
-    sudo -u nova \
-        start-stop-daemon --start --quiet --background \
-        --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON}
+    start-stop-daemon --start --quiet --background \
+        --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} \
+        -- --log-dir=/var/log/nova
 
     if [ $? -eq 0 ]; then
         echo "done."