From 527e341b74a5a28f13a0b760549436b32474f2d8 Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Tue, 27 Sep 2011 15:05:37 -0700
Subject: [PATCH] changes to support the new nova-vnc wsproxy

---
 stack.sh | 2 +-
 stackrc  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/stack.sh b/stack.sh
index 7ecbc83676..98e26cf6fb 100755
--- a/stack.sh
+++ b/stack.sh
@@ -462,7 +462,7 @@ screen_it n-cpu "cd $NOVA_DIR && echo $NOVA_DIR/bin/nova-compute | newgrp libvir
 screen_it n-net "cd $NOVA_DIR && $NOVA_DIR/bin/nova-network"
 screen_it n-sch "cd $NOVA_DIR && $NOVA_DIR/bin/nova-scheduler"
 # nova-vncproxy binds a privileged port, and so needs sudo
-screen_it n-vnc "cd $NOVA_DIR && sudo $NOVA_DIR/bin/nova-vncproxy"
+screen_it n-vnc "cd $NOVNC_DIR && ./utils/nova-wsproxy.py 6080 --web ."
 screen_it dash "cd $DASH_DIR && sudo /etc/init.d/apache2 restart; sudo tail -f /var/log/apache2/error.log"
 
 # Install Images
diff --git a/stackrc b/stackrc
index 2d265d3057..993bca8f45 100644
--- a/stackrc
+++ b/stackrc
@@ -12,7 +12,7 @@ KEYSTONE_BRANCH=diablo
 
 # a websockets/html5 or flash powered VNC console for vm instances
 NOVNC_REPO=https://github.com/cloudbuilders/noVNC.git
-NOVNC_BRANCH=master
+NOVNC_BRANCH=nova-vncproxy-redux
 
 # django powered web control panel for openstack
 DASH_REPO=https://github.com/cloudbuilders/openstack-dashboard.git