commit 39acde91f9fe83fdf7cfbeca248977f266070324
author Zuul <zuul@review.opendev.org> Sat Dec 04 17:33:24 2021 +0000
committer Gerrit Code Review <review@openstack.org> Sat Dec 04 17:33:24 2021 +0000
tree 802a6bdc203aa1c23713bf25a00ed4ab698c17b7
parent 31334f9a9b2edbdc4a7b45e2e04aaec827639d62
parent fc8ef86fbe09a467ee8bcffa79760d3f1e699450

Merge "Only write out uwsgi configs when deploying API services"

lib/nova

diff --git a/lib/nova b/lib/nova
index 8109446..67e2c71 100644
--- a/lib/nova
+++ b/lib/nova
@@ -836,7 +836,7 @@
             NOVNC_WEB_DIR=/usr/share/novnc
             install_package novnc
         else
-            NOVNC_WEB_DIR=$DEST/noVNC
+            NOVNC_WEB_DIR=$DEST/novnc
             git_clone $NOVNC_REPO $NOVNC_WEB_DIR $NOVNC_BRANCH
         fi
     fi

stackrc

diff --git a/stackrc b/stackrc
index 62749a7..4fc09af 100755
--- a/stackrc
+++ b/stackrc
@@ -590,8 +590,8 @@
 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:-v1.1.0}
+NOVNC_REPO=${NOVNC_REPO:-https://github.com/novnc/novnc.git}
+NOVNC_BRANCH=${NOVNC_BRANCH:-v1.3.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}