1. devstack
  2. Commit 8c5486993dec738a3e83746af2d62bdba648c999
Browse code

Bump noVNC to 1.0.0

This introduces a breaking change in the URLs used to access the console
[1]. This is updated in both the documentation and linked nova change.

[1] https://github.com/novnc/noVNC/commit/83391ffc

Change-Id: I14a0be0034f4a76ab37eb90325967500c3bf1ff9
Depends-On: I9a50a111ff4911f4364a1b24d646095c72af3d2c
Related-bug: #1682020

Stephen Finucane authored on 2018/05/11 19:42:17
Showing 3 changed files
doc/source/guides/multinode-lab.rst
History View file @ 8c54869
... ... 
@@ -177,7 +177,7 @@ machines, create a ``local.conf`` with:
177 177 
     GLANCE_HOSTPORT=$SERVICE_HOST:9292
178 178 
     ENABLED_SERVICES=n-cpu,q-agt,n-api-meta,c-vol,placement-client
179 179 
     NOVA_VNC_ENABLED=True
180 
-    NOVNCPROXY_URL="http://$SERVICE_HOST:6080/vnc_auto.html"
180 
+    NOVNCPROXY_URL="http://$SERVICE_HOST:6080/vnc_lite.html"
181 181 
     VNCSERVER_LISTEN=$HOST_IP
182 182 
     VNCSERVER_PROXYCLIENT_ADDRESS=$VNCSERVER_LISTEN
183 183
lib/nova
History View file @ 8c54869
... ... 
@@ -614,7 +614,16 @@ function configure_console_compute {
614 614 
     # All nova-compute workers need to know the vnc configuration options
615 615 
     # These settings don't hurt anything if n-xvnc and n-novnc are disabled
616 616 
     if is_service_enabled n-cpu; then
617 
-        NOVNCPROXY_URL=${NOVNCPROXY_URL:-"http://$SERVICE_HOST:6080/vnc_auto.html"}
617 
+        if [ "$NOVNC_FROM_PACKAGE" == "True" ]; then
618 
+            # Use the old URL when installing novnc packages.
619 
+            NOVNCPROXY_URL=${NOVNCPROXY_URL:-"http://$SERVICE_HOST:6080/vnc_auto.html"}
620 
+        elif vercmp ${NOVNC_BRANCH} "<" "1.0.0"; then
621 
+             # Use the old URL when installing older novnc source.
622 
+            NOVNCPROXY_URL=${NOVNCPROXY_URL:-"http://$SERVICE_HOST:6080/vnc_auto.html"}
623 
+        else
624 
+            # Use the new URL when building >=v1.0.0 from source.
625 
+            NOVNCPROXY_URL=${NOVNCPROXY_URL:-"http://$SERVICE_HOST:6080/vnc_lite.html"}
626 
+        fi
618 627 
         iniset $NOVA_CPU_CONF vnc novncproxy_base_url "$NOVNCPROXY_URL"
619 628 
         XVPVNCPROXY_URL=${XVPVNCPROXY_URL:-"http://$SERVICE_HOST:6081/console"}
620 629 
         iniset $NOVA_CPU_CONF vnc xvpvncproxy_base_url "$XVPVNCPROXY_URL"
stackrc
History View file @ 8c54869
... ... 
@@ -608,7 +608,7 @@ IRONIC_PYTHON_AGENT_BRANCH=${IRONIC_PYTHON_AGENT_BRANCH:-$TARGET_BRANCH}
608 608
609 609 
 # a websockets/html5 or flash powered VNC console for vm instances
610 610 
 NOVNC_REPO=${NOVNC_REPO:-https://github.com/novnc/noVNC.git}
611 
-NOVNC_BRANCH=${NOVNC_BRANCH:-stable/v0.6}
611 
+NOVNC_BRANCH=${NOVNC_BRANCH:-v1.0.0}
612 612
613 613 
 # a websockets/html5 or flash powered SPICE console for vm instances
614 614 
 SPICE_REPO=${SPICE_REPO:-http://anongit.freedesktop.org/git/spice/spice-html5.git}