Browse code

Merge "Fix FROM_PACKAGE checks for novnc and spice"

Jenkins authored on 2013/11/12 07:46:43
Showing 1 changed files
... ...
@@ -589,7 +589,8 @@ function install_nova() {
589 589
 
590 590
     if is_service_enabled n-novnc; then
591 591
         # a websockets/html5 or flash powered VNC console for vm instances
592
-        if trueorfalse True "$NOVNC_FROM_PACKAGE"; then
592
+        NOVNC_FROM_PACKAGE=`trueorfalse True $NOVNC_FROM_PACKAGE`
593
+        if [ "$NOVNC_FROM_PACKAGE" = "True" ]; then
593 594
             NOVNC_WEB_DIR=/usr/share/novnc
594 595
             install_package novnc
595 596
         else
... ...
@@ -600,7 +601,8 @@ function install_nova() {
600 600
 
601 601
     if is_service_enabled n-spice; then
602 602
         # a websockets/html5 or flash powered SPICE console for vm instances
603
-        if trueorfalse True "$SPICE_FROM_PACKAGE"; then
603
+        SPICE_FROM_PACKAGE=`trueorfalse True $SPICE_FROM_PACKAGE`
604
+        if [ "$SPICE_FROM_PACKAGE" = "True" ]; then
604 605
             SPICE_WEB_DIR=/usr/share/spice-html5
605 606
             install_package spice-html5
606 607
         else