From b625b4c4c3d299e3830951304f468a5399828b51 Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Thu, 3 Oct 2013 00:20:31 -0400
Subject: nova: add novnc console proxy support

With this commit the appropriate daemons are started on a control node boot to
support horizon console access via the novnc proxy.

Additionally, the proper nova configuration is set for boh the control and
compute nodes for out of the box console connectivity between the compute,
control and horizone interface.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../python/python-nova-controller_2013.1.3.bb      | 24 ++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'meta-openstack/recipes-devtools/python/python-nova-controller_2013.1.3.bb')

diff --git a/meta-openstack/recipes-devtools/python/python-nova-controller_2013.1.3.bb b/meta-openstack/recipes-devtools/python/python-nova-controller_2013.1.3.bb
index 36b5ba3..c99a890 100644
--- a/meta-openstack/recipes-devtools/python/python-nova-controller_2013.1.3.bb
+++ b/meta-openstack/recipes-devtools/python/python-nova-controller_2013.1.3.bb
@@ -5,19 +5,24 @@ PR = "r0"
 FILESEXTRAPATHS := "${THISDIR}/${PYTHON_PN}"
 
 SRC_URI += "file://nova-all \
+            file://nova-consoleauth \
+            file://nova-novncproxy \
             file://nova.conf \
             file://openrc \
            "
 
 inherit hosts update-rc.d
 
-#PACKAGES = "${SRCNAME}-controller ${SRCNAME}-controller-misc"
 PACKAGES = "${PN} ${PN}-dbg ${SRCNAME}-controller-misc ${SRCNAME}-controller"
+PACKAGES += " ${SRCNAME}-consoleauth"
+PACKAGES += " ${SRCNAME}-novncproxy"
 
 do_install_append() {
     if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
         install -d ${D}${sysconfdir}/init.d
         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
     fi
 }
 
@@ -49,7 +54,15 @@ pkg_postinst_${SRCNAME}-controller () {
 FILES_${SRCNAME}-controller = " \
 	${bindir} \
 	${sysconfdir}/${SRCNAME}/* \
-	${sysconfdir}/init.d/nova-all"
+	${sysconfdir}/init.d/nova-all \
+"
+
+FILES_${SRCNAME}-consoleauth = " \
+	${sysconfdir}/init.d/nova-consoleauth \
+"
+FILES_${SRCNAME}-novncproxy = " \
+	${sysconfdir}/init.d/nova-novncproxy \
+"
 
 FILES_${SRCNAME}-controller-misc = " \
 	${bindir}/nova-compute \
@@ -62,10 +75,13 @@ FILES_${SRCNAME}-controller-misc = " \
 FILES_${PN} = " \
 	${libdir}/python*/site-packages"
 
-RDEPENDS_${SRCNAME}-controller = "${PYTHON_PN} ${SRCNAME}-common \
+RDEPENDS_${SRCNAME}-controller = "${PYTHON_PN} ${SRCNAME}-common ${SRCNAME}-consoleauth \
+                                  ${SRCNAME}-novncproxy \
                                   postgresql postgresql-client python-psycopg2"
 
 RCONFLICTS_${SRCNAME}-controller = "${SRCNAME}-compute"
 
-INITSCRIPT_PACKAGES = "${SRCNAME}-controller"
+INITSCRIPT_PACKAGES = "${SRCNAME}-controller ${SRCNAME}-consoleauth ${SRCNAME}-novncproxy"
 INITSCRIPT_NAME_${SRCNAME}-controller = "nova-all"
+INITSCRIPT_NAME_${SRCNAME}-consoleauth = "nova-consoleauth"
+INITSCRIPT_NAME_${SRCNAME}-novncproxy = "nova-novncproxy"
-- 
cgit v1.2.3-54-g00ecf