Browse code
Change version of noVNC to stable
In master branch of noVNC project file vnc_auto.html was renamed to
vnc_lite.html Because of that nova-novncproxy looks for file that
actually doesn't exist.
We need to change branch of noVNC to latest stable, because other
projects are not ready yet to rename the path. Those projects
depends on noVNC package installed in system, but it is too old
for now for both CentOS (version 0.5) and Ubuntu (version 0.4).
The only way to make noVNC console working on Devstack is to change
the branch to stable one.
Unit test also has to be modified in order to ignore novnc repo
from checking against cloning non-master branch.
Change-Id: Iaf4761aedf93bc6b914a6a0c5cf1cfedcc29583c
Closes-bug: #1692513
Maciej Józefczyk authored on 2017/05/23 17:17:48Showing 2 changed files
| ... | ... |
@@ -563,7 +563,7 @@ IRONIC_PYTHON_AGENT_BRANCH=${IRONIC_PYTHON_AGENT_BRANCH:-master}
|
| 563 | 563 |
|
| 564 | 564 |
# a websockets/html5 or flash powered VNC console for vm instances |
| 565 | 565 |
NOVNC_REPO=${NOVNC_REPO:-https://github.com/kanaka/noVNC.git}
|
| 566 |
-NOVNC_BRANCH=${NOVNC_BRANCH:-master}
|
|
| 566 |
+NOVNC_BRANCH=${NOVNC_BRANCH:-stable/v0.6}
|
|
| 567 | 567 |
|
| 568 | 568 |
# a websockets/html5 or flash powered SPICE console for vm instances |
| 569 | 569 |
SPICE_REPO=${SPICE_REPO:-http://anongit.freedesktop.org/git/spice/spice-html5.git}
|
| ... | ... |
@@ -15,7 +15,7 @@ |
| 15 | 15 |
|
| 16 | 16 |
echo "Ensuring we don't have crazy refs" |
| 17 | 17 |
|
| 18 |
-REFS=`grep BRANCH stackrc | grep -v -- '-master'` |
|
| 18 |
+REFS=`grep BRANCH stackrc | grep -v -- '-master' | grep -v 'NOVNC_BRANCH'` |
|
| 19 | 19 |
rc=$? |
| 20 | 20 |
if [[ $rc -eq 0 ]]; then |
| 21 | 21 |
echo "Branch defaults must be master. Found:" |