openstack/devstack
Code Issues Proposed changes

Merge "Fix FROM_PACKAGE checks for novnc and spice"

Browse Source
This commit is contained in:
Jenkins 2013-11-11 22:46:43 +00:00 committed by Gerrit Code Review
commit 1722aabd9c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/nova
View File

@ -589,7 +589,8 @@ 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
if trueorfalse True "$NOVNC_FROM_PACKAGE"; then NOVNC_FROM_PACKAGE=`trueorfalse True $NOVNC_FROM_PACKAGE`
if [ "$NOVNC_FROM_PACKAGE" = "True" ]; then
NOVNC_WEB_DIR=/usr/share/novnc NOVNC_WEB_DIR=/usr/share/novnc
install_package novnc install_package novnc
else else
@ -600,7 +601,8 @@ function install_nova() {
if is_service_enabled n-spice; then if is_service_enabled n-spice; then
# a websockets/html5 or flash powered SPICE console for vm instances # a websockets/html5 or flash powered SPICE console for vm instances
if trueorfalse True "$SPICE_FROM_PACKAGE"; then SPICE_FROM_PACKAGE=`trueorfalse True $SPICE_FROM_PACKAGE`
if [ "$SPICE_FROM_PACKAGE" = "True" ]; then
SPICE_WEB_DIR=/usr/share/spice-html5 SPICE_WEB_DIR=/usr/share/spice-html5
install_package spice-html5 install_package spice-html5
else else