Fix FROM_PACKAGE checks for novnc and spice
The logic for installing novnc and spice from packages is broken,
which makes it impossible to install from git, which makes bug
1248923 more serious.
Change-Id: I9ae722a5470a16555bca9018da342485f6d3e896
Related-Bug: 1248923
diff --git a/lib/nova b/lib/nova
index eacd415..b9fa3e1 100644
--- a/lib/nova
+++ b/lib/nova
@@ -589,7 +589,8 @@
if is_service_enabled n-novnc; then
# 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
install_package novnc
else
@@ -600,7 +601,8 @@
if is_service_enabled n-spice; then
# 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
install_package spice-html5
else