From 05fd9160b88fc895d97f193bfc9a042d5bfeba28 Mon Sep 17 00:00:00 2001
From: Drew Thorstensen <thorst@us.ibm.com>
Date: Thu, 6 Apr 2017 16:56:01 -0400
Subject: [PATCH] Remove INSTALL_PYPOWERVM

This function is no longer required now that pypowervm is in the
global-requirements.txt.

Change-Id: I7fa465aedbba217f9d8c51b7b6972435ac5c130f
---
 devstack/plugin.sh            |  6 ------
 devstack/powervm-functions.sh | 17 -----------------
 devstack/settings             |  1 -
 3 files changed, 24 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 6142004..dde56bb 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -47,11 +47,6 @@ function configure_ceilometer_powervm {
 
 # install_ceilometer_powervm() - Install ceilometer_powervm and necessary dependencies
 function install_ceilometer_powervm {
-    if [[ "$INSTALL_PYPOWERVM" == "True" ]]; then
-        echo_summary "Installing pypowervm"
-        install_pypowervm
-    fi
-
     # Install the ceilometer-powervm package
     setup_develop $CEILOMETER_POWERVM_DIR
 }
@@ -115,7 +110,6 @@ if is_service_enabled pvm-ceilometer-acompute; then
         # clean.sh first calls unstack.sh
         echo_summary "Cleaning up ceilometer-powervm and associated data"
         cleanup_ceilometer_powervm
-        cleanup_pypowervm
     fi
 fi
 
diff --git a/devstack/powervm-functions.sh b/devstack/powervm-functions.sh
index fae9678..2901eca 100644
--- a/devstack/powervm-functions.sh
+++ b/devstack/powervm-functions.sh
@@ -3,26 +3,9 @@
 # devstack/powervm-functions.sh
 # Functions to control the installation and configuration of the PowerVM compute services
 
-GITREPO["pypowervm"]=${PYPOWERVM_REPO:-https://github.com/powervm/pypowervm}
-GITBRANCH["pypowervm"]=${PYPOWERVM_BRANCH:-develop}
-GITDIR["pypowervm"]=$DEST/pypowervm
-
 # TODO (adreznec) Uncomment when public NovaLink PPA available
 # NOVALINK_PPA=${NOVALINK_PPA:-TBD}
 
-function install_pypowervm {
-    # Install the latest pypowervm from git
-    echo_summary "Installing pypowervm"
-    git_clone_by_name "pypowervm"
-    setup_dev_lib "pypowervm"
-    echo_summary "Pypowervm install complete"
-}
-
-function cleanup_pypowervm {
-    echo_summary "Cleaning pypowervm"
-    rm -rf ${GITDIR["pypowervm"]}
-}
-
 function check_novalink_install {
     echo_summary "Checking NovaLink installation"
     if ! ( is_package_installed pvm-novalink ); then
diff --git a/devstack/settings b/devstack/settings
index 3f73906..46ab045 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -6,7 +6,6 @@ enable_service pvm-ceilometer-acompute
 
 # NovaLink install/upgrade settings
 INSTALL_NOVALINK=$(trueorfalse False INSTALL_NOVALINK)
-INSTALL_PYPOWERVM=$(trueorfalse False INSTALL_PYPOWERVM)
 PVM_ADMIN_GROUP=${PVM_ADMIN_GROUP:-pvm_admin}
 
 # Ceilometer settings