From 9a74961bafabc404f015fc5d8a9da969d263dad3 Mon Sep 17 00:00:00 2001
From: Amy Fong <amy.fong@windriver.com>
Date: Mon, 17 Mar 2014 14:14:48 -0400
Subject: OpenStack: Add to missing functionality in sysvinit scripts

Add status/reload to sysvinit scripts
Modify tgtd to make start/stop work better (borrowed from Debian's
implementation)

Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../python/python-cinder/cinder-volume                | 19 +++++++++++++++++--
 .../recipes-devtools/python/python-cinder/cinder.init | 19 +++++++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)

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

diff --git a/meta-openstack/recipes-devtools/python/python-cinder/cinder-volume b/meta-openstack/recipes-devtools/python/python-cinder/cinder-volume
index 3cc2aa3..2c9334e 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder/cinder-volume
+++ b/meta-openstack/recipes-devtools/python/python-cinder/cinder-volume
@@ -56,6 +56,18 @@ stop()
     rm -f $PIDFILE
 }
 
+status()
+{
+    pid=`cat $PIDFILE 2>/dev/null`
+    if [ -n "$pid" ]; then
+        if ps -p $pid >&- ; then
+            echo "$DESC is running"
+            return
+        fi
+    fi
+    echo "$DESC is not running"
+}
+
 case "$1" in
     start)
         start
@@ -63,12 +75,15 @@ case "$1" in
     stop)
         stop
         ;;
-    restart|force-reload)
+    restart|force-reload|reload)
         stop
         start
         ;;
+    status)
+	status
+        ;;
     *)
-        echo "Usage: $0 {start|stop|force-reload|restart}"
+        echo "Usage: $0 {start|stop|force-reload|restart|reload|status}"
         exit 1
         ;;
 esac
diff --git a/meta-openstack/recipes-devtools/python/python-cinder/cinder.init b/meta-openstack/recipes-devtools/python/python-cinder/cinder.init
index 7ae3dbf..0a3923a 100644
--- a/meta-openstack/recipes-devtools/python/python-cinder/cinder.init
+++ b/meta-openstack/recipes-devtools/python/python-cinder/cinder.init
@@ -54,6 +54,18 @@ stop()
     rm -f $PIDFILE
 }
 
+status()
+{
+    pid=`cat $PIDFILE 2>/dev/null`
+    if [ -n "$pid" ]; then
+        if ps -p $pid >&- ; then
+            echo "$DESC is running"
+            return
+        fi
+    fi
+    echo "$DESC is not running"
+}
+
 case "$1" in
     start)
         start
@@ -61,12 +73,15 @@ case "$1" in
     stop)
         stop
         ;;
-    restart|force-reload)
+    restart|force-reload|reload)
         stop
         start
         ;;
+    status)
+	status
+        ;;
     *)
-        echo "Usage: $0 {start|stop|force-reload|restart}"
+        echo "Usage: $0 {start|stop|force-reload|restart|reload|status}"
         exit 1
         ;;
 esac
-- 
cgit v1.2.3-54-g00ecf