From bf3d5186707f0ab3da2890d91bb33f90e4afa264 Mon Sep 17 00:00:00 2001
From: adreznec <adreznec@us.ibm.com>
Date: Tue, 15 Dec 2015 14:50:03 -0600
Subject: [PATCH] Disable installing pypowervm by default

Add a configurable option to choose to install pypowervm from source,
otherwise default to relying on it already being installed

Change-Id: I15b85c8bcae163e762310efdabfdc26d72e2b629
---
 devstack/local.conf.aio     | 3 +++
 devstack/local.conf.compute | 3 +++
 devstack/plugin.sh          | 7 +++++--
 devstack/settings           | 3 ++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/devstack/local.conf.aio b/devstack/local.conf.aio
index 62bc1d8b..8a14216e 100644
--- a/devstack/local.conf.aio
+++ b/devstack/local.conf.aio
@@ -30,6 +30,9 @@ TENANT_VLAN_RANGE=1000:1999
 DISK_DRIVER=localdisk
 VOL_GRP_NAME=devstackvg
 
+# Set to True to install the latest pypowervm from source
+INSTALL_PYPOWERVM=False
+
 # Enable services (pvm-q-agt and pvm-ceilometer-acompute started by their plugins)
 enable_service n-novnc neutron q-svc
 disable_service n-net
diff --git a/devstack/local.conf.compute b/devstack/local.conf.compute
index 59d20fbe..2bb82381 100644
--- a/devstack/local.conf.compute
+++ b/devstack/local.conf.compute
@@ -34,6 +34,9 @@ TENANT_VLAN_RANGE=1000:1999
 DISK_DRIVER=localdisk
 VOL_GRP_NAME=devstackvg
 
+# Set to True to install the latest pypowervm from source
+INSTALL_PYPOWERVM=False
+
 NOVA_VNC_ENABLED=True
 NOVNCPROXY_BASE_URL="http://$SERVICE_HOST:6080/vnc_auto.html"
 VNCSERVER_LISTEN=$HOST_IP
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 6d231dc8..ea49d77c 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -69,7 +69,10 @@ function configure_nova_powervm {
 
 # install_nova_powervm() - Install nova_powervm and necessary dependencies
 function install_nova_powervm {
-    install_pypowervm
+    if [[ "$INSTALL_PYPOWERVM" == "True" ]]; then
+        echo_summary "Installing pypowervm"
+        install_pypowervm
+    fi
 
     # Install the nova-powervm package
     setup_develop $NOVA_POWERVM_DIR
@@ -102,7 +105,7 @@ function cleanup_nova_powervm {
 if is_service_enabled nova-powervm; then
     if [[ "$1" == "stack" && "$2" == "pre-install" ]]; then
         # Install NovaLink if set
-        if [[ "$INSTALL_NOVALINK" == "True" ]]; then
+        if [[ "$INSTALL_NOVALINK" = "True" ]]; then
             echo_summary "Installing NovaLink"
             install_novalink
         fi
diff --git a/devstack/settings b/devstack/settings
index b03fd3b8..6d56666d 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -5,7 +5,8 @@
 enable_service nova-powervm
 
 # NovaLink install/upgrade settings
-INSTALL_NOVALINK=${INSTALL_NOVALINK:-False}
+INSTALL_NOVALINK=$(trueorfalse False INSTALL_NOVALINK)
+INSTALL_PYPOWERVM=$(trueorfalse False INSTALL_PYPOWERVM)
 PVM_ADMIN_GROUP=${PVM_ADMIN_GROUP:-pvm_admin}
 
 # Nova settings