commit 3edddd108a4b5c785c7916b40aa153e055d54d8a
author Daniel P. Berrange <berrange@redhat.com> Thu Jan 03 12:06:47 2013 +0000
committer Daniel P. Berrange <berrange@redhat.com> Thu Jan 17 14:05:09 2013 +0000
tree a8b7dc0454ae1d9e968ade11a7eaba0fd80cd9a8
parent a1e1b5c192d3c6176c9a16da9db4ff98a64fbe7c

Run nova-novncproxy binary in the nova GIT trree

The nova-novncproxy binary was pulled into the nova GIT tree
several months back, so devstack should run that version,
rather than the legacy version from the noVNC GIT tree.

Change-Id: I289989d5c0831c75117f059dd8f2decb1f9d3a90
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

lib/nova

diff --git a/lib/nova b/lib/nova
index 8135bf1..dd68432 100644
--- a/lib/nova
+++ b/lib/nova
@@ -549,7 +549,7 @@
     screen_it n-crt "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-cert"
     screen_it n-net "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-network"
     screen_it n-sch "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-scheduler"
-    screen_it n-novnc "cd $NOVNC_DIR && ./utils/nova-novncproxy --config-file $NOVA_CONF --web ."
+    screen_it n-novnc "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-novncproxy --config-file $NOVA_CONF --web $NOVNC_DIR"
     screen_it n-xvnc "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-xvpvncproxy --config-file $NOVA_CONF"
     screen_it n-cauth "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-consoleauth"
 }