From 654a6a959bfc9ac604476ec817fbbb9a20be587b Mon Sep 17 00:00:00 2001
From: Alessio Ababilov <aababilo@yahoo-inc.com>
Date: Fri, 21 Jun 2013 19:41:29 +0300
Subject: [PATCH] Do not use novnc anymore

spicehtml5proxy is used instead.

Change-Id: Ifefa39dbcc58f5b251b203c3ac45add05df11d58
---
 conf/personas/in-a-box/basic-quantum.yaml | 6 +++---
 conf/personas/in-a-box/basic-web.yaml     | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/conf/personas/in-a-box/basic-quantum.yaml b/conf/personas/in-a-box/basic-quantum.yaml
index c782ecdc..4d437ce7 100644
--- a/conf/personas/in-a-box/basic-quantum.yaml
+++ b/conf/personas/in-a-box/basic-quantum.yaml
@@ -49,15 +49,15 @@ subsystems:
     - cert
     - compute
     - consoleauth
-    - network
-    - novncproxy
     - scheduler
     - xvpvncproxy
     quantum:
     - server
     - linuxbridge-agent
     cinder:
-    - all
+    - api
+    - scheduler
+    - volume
 supports:
 - rhel
 ...
diff --git a/conf/personas/in-a-box/basic-web.yaml b/conf/personas/in-a-box/basic-web.yaml
index 6f6d70cb..e8a683c2 100644
--- a/conf/personas/in-a-box/basic-web.yaml
+++ b/conf/personas/in-a-box/basic-web.yaml
@@ -22,9 +22,6 @@ components:
 - django-openstack-auth
 - horizon
 options:
-    novnc:
-        # This is the nova component name (we need this to hook into the nova conf...)
-        nova-component: nova
     nova:
         db-sync: true
         do-network-init: true
@@ -60,7 +57,6 @@ subsystems:
     - conductor
     - consoleauth
     - network
-    - novncproxy
     - scheduler
     - xvpvncproxy
     - spicehtml5proxy