From ec4dd1f12eff5aab513845cafa87fbec8166adff Mon Sep 17 00:00:00 2001
From: Amy Fong <amy.fong@windriver.com>
Date: Fri, 21 Mar 2014 17:07:29 -0400
Subject: OpenStack: nova-novncproxy:can't stop this service

nova-novncproxy and nova-spicehtml5proxy both do not check to see if the process
specified in PIDFILE exists before firing off a new one. Both initrd files can
actually use nova.init (used for the many other nova-* daemons)

nova-consoleauth also has this issue, we add a check in start to see if the process
in PIDFILE exists and exits if it does.

Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../python/python-nova/nova-novncproxy             | 94 ----------------------
 1 file changed, 94 deletions(-)
 delete mode 100644 meta-openstack/recipes-devtools/python/python-nova/nova-novncproxy

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

diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova-novncproxy b/meta-openstack/recipes-devtools/python/python-nova/nova-novncproxy
deleted file mode 100644
index f2b2f22..0000000
--- a/meta-openstack/recipes-devtools/python/python-nova/nova-novncproxy
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          nova-novncproxy
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Should-Start:      libvirt-bin
-# Should-Stop:       libvirt-bin
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: nova-novncproxy service
-# Description:       Provides vnc proxy services for the openstack
-#                    cloud computing system
-### END INIT INFO
-
-
-set -e
-
-DAEMON=/usr/bin/nova-novncproxy
-DAEMON_ARGS=""
-PIDFILE=/var/run/nova/nova-novncproxy.pid
-
-ENABLED=true
-
-if test -f /etc/default/nova-consoleproxy; then
-  . /etc/default/nova-consoleproxy
-fi
-
-# default to novnc
-if [ -z "${NOVA_CONSOLE_PROXY_TYPE}" ] ; then
-	NOVA_CONSOLE_PROXY_TYPE="novnc"
-fi
-
-if ! [ "${NOVA_CONSOLE_PROXY_TYPE}" = "novnc" ] ; then
-	exit 0
-fi
-
-mkdir -p /var/run/nova
-chown nova:root /var/run/nova/
-
-mkdir -p /var/lock/nova
-chown nova:root /var/lock/nova/
-
-. /lib/lsb/init-functions
-
-export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
-export TMPDIR=/var/lib/nova/tmp
-
-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
-    echo "Starting nova vnc proxy" "nova-novncproxy"
-    start-stop-daemon --start -b -m --pidfile $PIDFILE --exec ${DAEMON} -- ${DAEMON_ARGS}
-    log_end_msg $?
-    ;;
-  stop)
-    test "$ENABLED" = "true" || exit 0
-    echo "Stopping nova vnc proxy" "nova-novncproxy"
-    start-stop-daemon --stop --oknodo --pidfile ${PIDFILE}
-    log_end_msg $?
-    ;;
-  restart|force-reload|reload)
-    test "$ENABLED" = "true" || exit 1
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  status)
-    test "$ENABLED" = "true" || exit 0
-    status
-    ;;
-  *)
-    echo "Usage: /etc/init.d/nova-novncproxy {start|stop|restart|force-reload|status|reload|status}"
-    exit 1
-    ;;
-esac
-
-exit 0
-- 
cgit v1.2.3-54-g00ecf