OpenStack: modify controller to be able to talk to both console

We modify the controller so that both vnc and spice html5 proxies are running.
Since in the current recipe, both controller and compute share the same nova.conf
file, in the compute, both vnc and spice html5 are set to enabled and in this
configuration, vnc is chosen (in source: vnc is chosen because it's better
tested).

To change to spice, only change required is on the compute side.

The controller (since the default console_type is auto) will try to talk
to both and run whichever is available.

Signed-off-by: Amy Fong <amy.fong@windriver.com>

1 files changed, 1 insertions, 12 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb
index 17712d5..0a70aca 100644
--- a/meta-openstack/recipes-devtools/python/python-nova_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb
@@ -20,11 +20,9 @@ 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.conf \
             file://openrc \
-            file://nova-consoleproxy \
            "
 SRCREV="afc9e4e23327fb566e8ade2c0c06c90d369c9e29"
 PV="2013.2.2+git${SRCPV}"
@@ -109,21 +107,13 @@ do_install_append() {
         install -m 0755 ${WORKDIR}/nova-all ${D}${sysconfdir}/init.d/nova-all
         install -m 0755 ${WORKDIR}/nova-consoleauth ${D}${sysconfdir}/init.d/nova-consoleauth
 
-        for binary in api compute network scheduler cert conductor; do
+        for binary in api compute network scheduler cert conductor novncproxy spicehtml5proxy; 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}
-
-    install -D -o nova -m 664 ${WORKDIR}/nova-consoleproxy ${D}${sysconfdir}/default/nova-consoleproxy
 }
 
 pkg_postinst_${SRCNAME}-setup () {
@@ -196,7 +186,6 @@ FILES_${SRCNAME}-novncproxy = " \
 "
 FILES_${SRCNAME}-spicehtml5proxy = " \
         ${sysconfdir}/init.d/nova-spicehtml5proxy \
-        ${sysconfdir}/default/nova-consoleproxy \
 "
 FILES_${SRCNAME}-network = " \
         ${sysconfdir}/init.d/nova-network \