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>

1 files changed, 7 insertions, 4 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index 427c167..17712d5 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -20,9 +20,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \
 
 SRC_URI += "file://nova-all \
             file://nova.init \
+            file://nova-console.init \
             file://nova-consoleauth \
-            file://nova-novncproxy \
-            file://nova-spicehtml5proxy \
             file://nova.conf \
             file://openrc \
             file://nova-consoleproxy \
@@ -109,13 +108,17 @@ do_install_append() {
         # nova-all is installed (and packaged), but not used as an initscript by default
         install -m 0755 ${WORKDIR}/nova-all ${D}${sysconfdir}/init.d/nova-all
         install -m 0755 ${WORKDIR}/nova-consoleauth ${D}${sysconfdir}/init.d/nova-consoleauth
-        install -m 0755 ${WORKDIR}/nova-novncproxy ${D}${sysconfdir}/init.d/nova-novncproxy
-        install -m 0755 ${WORKDIR}/nova-spicehtml5proxy ${D}${sysconfdir}/init.d/nova-spicehtml5proxy
 
         for binary in api compute network scheduler cert conductor; do
             sed "s:@suffix@:$binary:" < ${WORKDIR}/nova.init >${WORKDIR}/nova-$binary.init.sh
             install -m 0755 ${WORKDIR}/nova-$binary.init.sh ${D}${sysconfdir}/init.d/nova-$binary
         done    
+        for binary in novncproxy spicehtml5proxy; do
+            proxy_type=`echo $binary | sed -e 's/proxy//;'`
+            sed "s:@suffix@:$binary:" < ${WORKDIR}/nova-console.init | \
+                sed "s:@proxy_type@:$proxy_type:" >${WORKDIR}/nova-$binary.init.sh
+            install -m 0755 ${WORKDIR}/nova-$binary.init.sh ${D}${sysconfdir}/init.d/nova-$binary
+        done    
     fi
 
     cp run_tests.sh ${NOVA_CONF_DIR}