openstack/ceilometer-powervm
Code Issues Proposed changes

Remove INSTALL_PYPOWERVM

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

Change-Id: I7fa465aedbba217f9d8c51b7b6972435ac5c130f
This commit is contained in:
Drew Thorstensen 2017-04-06 16:56:01 -04:00 committed by Drew Thorstensen (thorst)
parent 562b5182f8
commit 05fd9160b8
3 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/plugin.sh
View File

@ -47,11 +47,6 @@ function configure_ceilometer_powervm {
# install_ceilometer_powervm() - Install ceilometer_powervm and necessary dependencies # install_ceilometer_powervm() - Install ceilometer_powervm and necessary dependencies
function install_ceilometer_powervm { function install_ceilometer_powervm {
if [[ "$INSTALL_PYPOWERVM" == "True" ]]; then
echo_summary "Installing pypowervm"
install_pypowervm
fi
# Install the ceilometer-powervm package # Install the ceilometer-powervm package
setup_develop $CEILOMETER_POWERVM_DIR setup_develop $CEILOMETER_POWERVM_DIR
} }
@ -115,7 +110,6 @@ if is_service_enabled pvm-ceilometer-acompute; then
# clean.sh first calls unstack.sh # clean.sh first calls unstack.sh
echo_summary "Cleaning up ceilometer-powervm and associated data" echo_summary "Cleaning up ceilometer-powervm and associated data"
cleanup_ceilometer_powervm cleanup_ceilometer_powervm
cleanup_pypowervm
fi fi
fi fi

17
devstack/powervm-functions.sh
View File

@ -3,26 +3,9 @@
# devstack/powervm-functions.sh # devstack/powervm-functions.sh
# Functions to control the installation and configuration of the PowerVM compute services # 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 # TODO (adreznec) Uncomment when public NovaLink PPA available
# NOVALINK_PPA=${NOVALINK_PPA:-TBD} # 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 { function check_novalink_install {
echo_summary "Checking NovaLink installation" echo_summary "Checking NovaLink installation"
if ! ( is_package_installed pvm-novalink ); then if ! ( is_package_installed pvm-novalink ); then

1
devstack/settings
View File

@ -6,7 +6,6 @@ enable_service pvm-ceilometer-acompute
# NovaLink install/upgrade settings # NovaLink install/upgrade settings
INSTALL_NOVALINK=$(trueorfalse False INSTALL_NOVALINK) INSTALL_NOVALINK=$(trueorfalse False INSTALL_NOVALINK)
INSTALL_PYPOWERVM=$(trueorfalse False INSTALL_PYPOWERVM)
PVM_ADMIN_GROUP=${PVM_ADMIN_GROUP:-pvm_admin} PVM_ADMIN_GROUP=${PVM_ADMIN_GROUP:-pvm_admin}
# Ceilometer settings # Ceilometer settings