@@ -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

@@ -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