1. devstack
  2. Commit 3edddd108a4b5c785c7916b40aa153e055d54d8a
Browse code

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>

Daniel P. Berrange authored on 2013/01/03 21:06:47
Showing 1 changed files
lib/nova
History View file @ 3edddd1
... ... 
@@ -549,7 +549,7 @@ function start_nova() {
549 549 
     screen_it n-crt "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-cert"
550 550 
     screen_it n-net "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-network"
551 551 
     screen_it n-sch "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-scheduler"
552 
-    screen_it n-novnc "cd $NOVNC_DIR && ./utils/nova-novncproxy --config-file $NOVA_CONF --web ."
552 
+    screen_it n-novnc "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-novncproxy --config-file $NOVA_CONF --web $NOVNC_DIR"
553 553 
     screen_it n-xvnc "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-xvpvncproxy --config-file $NOVA_CONF"
554 554 
     screen_it n-cauth "cd $NOVA_DIR && $NOVA_BIN_DIR/nova-consoleauth"
555 555 
 }