1 files changed, 16 insertions, 3 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova-novncproxy b/meta-openstack/recipes-devtools/python/python-nova/nova-novncproxy
index 76cd1df..c976194 100644
--- a/meta-openstack/recipes-devtools/python/python-nova/nova-novncproxy
+++ b/meta-openstack/recipes-devtools/python/python-nova/nova-novncproxy
@@ -40,6 +40,19 @@ if ! [ -x ${DAEMON} ] ; then
         exit 0
 fi
 
+DESC="nova vnc proxy"
+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)
     test "$ENABLED" = "true" || exit 0
@@ -53,7 +66,7 @@ case "$1" in
     start-stop-daemon --stop --oknodo --pidfile ${PIDFILE}
     log_end_msg $?
     ;;
-  restart|force-reload)
+  restart|force-reload|reload)
     test "$ENABLED" = "true" || exit 1
     $0 stop
     sleep 1
@@ -61,10 +74,10 @@ case "$1" in
     ;;
   status)
     test "$ENABLED" = "true" || exit 0
-    status_of_proc -p $PIDFILE $DAEMON nova-novncproxy && exit 0 || exit $?
+    status
     ;;
   *)
-    echo "Usage: /etc/init.d/nova-novncproxy {start|stop|restart|force-reload|status}"
+    echo "Usage: /etc/init.d/nova-novncproxy {start|stop|restart|force-reload|status|reload|status}"
     exit 1
     ;;
 esac