Merge "Don't install novnc from package by default"

This commit is contained in:
Jenkins 2013-11-15 23:44:23 +00:00 committed by Gerrit Code Review
commit c85ac787ba

View File

@ -589,7 +589,7 @@ function install_nova() {
if is_service_enabled n-novnc; then if is_service_enabled n-novnc; then
# a websockets/html5 or flash powered VNC console for vm instances # a websockets/html5 or flash powered VNC console for vm instances
NOVNC_FROM_PACKAGE=`trueorfalse True $NOVNC_FROM_PACKAGE` NOVNC_FROM_PACKAGE=`trueorfalse False $NOVNC_FROM_PACKAGE`
if [ "$NOVNC_FROM_PACKAGE" = "True" ]; then if [ "$NOVNC_FROM_PACKAGE" = "True" ]; then
NOVNC_WEB_DIR=/usr/share/novnc NOVNC_WEB_DIR=/usr/share/novnc
install_package novnc install_package novnc