@@ -177,7 +177,7 @@ machines, create a ``local.conf`` with:

     GLANCE_HOSTPORT=$SERVICE_HOST:9292

     ENABLED_SERVICES=n-cpu,q-agt,n-api-meta,c-vol,placement-client

     NOVA_VNC_ENABLED=True

-    NOVNCPROXY_URL="http://$SERVICE_HOST:6080/vnc_auto.html"

+    NOVNCPROXY_URL="http://$SERVICE_HOST:6080/vnc_lite.html"

     VNCSERVER_LISTEN=$HOST_IP

     VNCSERVER_PROXYCLIENT_ADDRESS=$VNCSERVER_LISTEN

@@ -614,7 +614,16 @@ function configure_console_compute {

     # All nova-compute workers need to know the vnc configuration options

     # These settings don't hurt anything if n-xvnc and n-novnc are disabled

     if is_service_enabled n-cpu; then

-        NOVNCPROXY_URL=${NOVNCPROXY_URL:-"http://$SERVICE_HOST:6080/vnc_auto.html"}

+        if [ "$NOVNC_FROM_PACKAGE" == "True" ]; then

+            # Use the old URL when installing novnc packages.

+            NOVNCPROXY_URL=${NOVNCPROXY_URL:-"http://$SERVICE_HOST:6080/vnc_auto.html"}

+        elif vercmp ${NOVNC_BRANCH} "<" "1.0.0"; then

+             # Use the old URL when installing older novnc source.

+            NOVNCPROXY_URL=${NOVNCPROXY_URL:-"http://$SERVICE_HOST:6080/vnc_auto.html"}

+        else

+            # Use the new URL when building >=v1.0.0 from source.

+            NOVNCPROXY_URL=${NOVNCPROXY_URL:-"http://$SERVICE_HOST:6080/vnc_lite.html"}

+        fi

         iniset $NOVA_CPU_CONF vnc novncproxy_base_url "$NOVNCPROXY_URL"

         XVPVNCPROXY_URL=${XVPVNCPROXY_URL:-"http://$SERVICE_HOST:6081/console"}

         iniset $NOVA_CPU_CONF vnc xvpvncproxy_base_url "$XVPVNCPROXY_URL"

@@ -607,7 +607,7 @@ IRONIC_PYTHON_AGENT_BRANCH=${IRONIC_PYTHON_AGENT_BRANCH:-$TARGET_BRANCH}

 # a websockets/html5 or flash powered VNC console for vm instances

 NOVNC_REPO=${NOVNC_REPO:-https://github.com/novnc/noVNC.git}

-NOVNC_BRANCH=${NOVNC_BRANCH:-stable/v0.6}

+NOVNC_BRANCH=${NOVNC_BRANCH:-v1.0.0}

 # a websockets/html5 or flash powered SPICE console for vm instances

 SPICE_REPO=${SPICE_REPO:-http://anongit.freedesktop.org/git/spice/spice-html5.git}