From 984c2d69f51824a4c1e7b3a448fe24759e594026 Mon Sep 17 00:00:00 2001
From: Amy Fong <amy.fong@windriver.com>
Date: Fri, 28 Mar 2014 13:56:02 -0400
Subject: 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>
---
 .../recipes-devtools/python/python-ceilometer/ceilometer.init    | 2 +-
 meta-openstack/recipes-devtools/python/python-cinder/cinder.init | 7 ++++++-
 meta-openstack/recipes-devtools/python/python-glance/glance.init | 2 +-
 meta-openstack/recipes-devtools/python/python-heat/heat.init     | 2 +-
 meta-openstack/recipes-devtools/python/python-keystone/keystone  | 6 +++++-
 .../recipes-devtools/python/python-neutron/neutron-agent.init    | 7 ++++++-
 .../recipes-devtools/python/python-neutron/neutron-server.init   | 8 +++++++-
 meta-openstack/recipes-devtools/python/python-nova/nova-all      | 7 ++++++-
 .../recipes-devtools/python/python-nova/nova-consoleauth         | 9 ++++++---
 meta-openstack/recipes-devtools/python/python-nova/nova.init     | 9 ++++++---
 10 files changed, 45 insertions(+), 14 deletions(-)

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

diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.init b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.init
index 23ca780..d3c72e4 100644
--- a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.init
+++ b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.init
@@ -37,7 +37,7 @@ start()
 
     start-stop-daemon --start --quiet --background \
         --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} \
-	-- --config-file $CONFIG
+	-- --config-file $CONFIG --log-dir=/var/log/ceilometer
 
     if [ $? -eq 0 ]; then
         echo "done."
diff --git a/meta-openstack/recipes-devtools/python/python-cinder/cinder.init b/meta-openstack/recipes-devtools/python/python-cinder/cinder.init
index 0a3923a..ecf9d66 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder/cinder.init
+++ b/meta-openstack/recipes-devtools/python/python-cinder/cinder.init
@@ -30,10 +30,15 @@ start()
         fi
     fi
 
+    if [ ! -d /var/log/cinder ]; then
+        mkdir  /var/log/cinder                                                      
+    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/cinder
 
     if [ $? -eq 0 ]; then
         echo "done."
diff --git a/meta-openstack/recipes-devtools/python/python-glance/glance.init b/meta-openstack/recipes-devtools/python/python-glance/glance.init
index def500f..cb94ed7 100644
--- a/meta-openstack/recipes-devtools/python/python-glance/glance.init
+++ b/meta-openstack/recipes-devtools/python/python-glance/glance.init
@@ -37,7 +37,7 @@ start()
 
     start-stop-daemon --start --quiet --background \
         --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} \
-	-- --config-file $CONFIG
+	-- --config-file $CONFIG --log-dir=/var/log/glance
 
     if [ $? -eq 0 ]; then
         echo "done."
diff --git a/meta-openstack/recipes-devtools/python/python-heat/heat.init b/meta-openstack/recipes-devtools/python/python-heat/heat.init
index e37c4c8..4d8c180 100644
--- a/meta-openstack/recipes-devtools/python/python-heat/heat.init
+++ b/meta-openstack/recipes-devtools/python/python-heat/heat.init
@@ -43,7 +43,7 @@ start()
 
     start-stop-daemon --start --quiet --background \
         --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} \
-	-- --config-file $CONFIG
+	-- --config-file $CONFIG --log-dir=/var/log/heat
 
     if [ $? -eq 0 ]; then
         echo "done."
diff --git a/meta-openstack/recipes-devtools/python/python-keystone/keystone b/meta-openstack/recipes-devtools/python/python-keystone/keystone
index 463b05f..d73bc75 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone/keystone
+++ b/meta-openstack/recipes-devtools/python/python-keystone/keystone
@@ -27,10 +27,14 @@ start ()
         fi
     fi
 
+    if [ ! -d /var/log/keystone ]; then
+        mkdir /var/log/keystone                                                     
+    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/keystone
 
     if [ $? -eq 0 ]; then
         echo "done."
diff --git a/meta-openstack/recipes-devtools/python/python-neutron/neutron-agent.init b/meta-openstack/recipes-devtools/python/python-neutron/neutron-agent.init
index e02ea9e..01cb27e 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron/neutron-agent.init
+++ b/meta-openstack/recipes-devtools/python/python-neutron/neutron-agent.init
@@ -26,10 +26,15 @@ start()
         fi
     fi
 
+    if [ ! -d /var/log/neutron ]; then
+        mkdir -p /var/log/neutron
+    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/neutron
 
     if [ $? -eq 0 ]; then
         echo "done."
diff --git a/meta-openstack/recipes-devtools/python/python-neutron/neutron-server.init b/meta-openstack/recipes-devtools/python/python-neutron/neutron-server.init
index bd1fe86..63440e8 100644
--- a/meta-openstack/recipes-devtools/python/python-neutron/neutron-server.init
+++ b/meta-openstack/recipes-devtools/python/python-neutron/neutron-server.init
@@ -13,7 +13,9 @@
 DESC="neutron-server"
 DAEMON="/usr/bin/neutron-server"
 PIDFILE="/var/run/neutron-server.pid"
-DAEMON_ARGS="--config-file=/etc/neutron/neutron.conf --config-file=@plugin@"
+DAEMON_ARGS="--config-file=/etc/neutron/neutron.conf \
+  --config-file=@plugin@ \
+  --log-dir=/var/log/neutron"
 
 start() 
 {
@@ -28,6 +30,10 @@ start()
         fi
     fi
 
+    if [ ! -d /var/log/neutron ]; then
+        mkdir /var/log/neutron
+    fi
+
     echo -n "Starting $DESC..."
 
     start-stop-daemon --start --quiet --background \
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."
-- 
cgit v1.2.3-54-g00ecf