From 6423ced4885488dbe8cc05249d7d16cbcfe750c2 Mon Sep 17 00:00:00 2001
From: Amy Fong <amy.fong@windriver.com>
Date: Thu, 20 Mar 2014 15:46:59 -0400
Subject: OpenStack: add SPICE console support

Package spice-html5

Modify python-nova to add infrastructure for nova-spicehtml5proxy
support.

Note: spice is the default

Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../recipes-devtools/python/python-nova/nova-novncproxy     | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(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
index c976194..f2b2f22 100644
--- a/meta-openstack/recipes-devtools/python/python-nova/nova-novncproxy
+++ b/meta-openstack/recipes-devtools/python/python-nova/nova-novncproxy
@@ -21,8 +21,17 @@ PIDFILE=/var/run/nova/nova-novncproxy.pid
 
 ENABLED=true
 
-if test -f /etc/default/nova-novncproxy; then
-  . /etc/default/nova-novncproxy
+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
-- 
cgit v1.2.3-54-g00ecf