openstack
/
ceilometer-powervm
Code Issues Proposed changes

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: Ie9a9da4caa81d971f11c4c134f3c12552e18dae3
This commit is contained in:
adreznec 2015-12-15 15:04:06 -06:00
parent 7f05a9745f
commit c330518f43
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/plugin.sh
View File

@ -47,7 +47,10 @@ function configure_ceilometer_powervm {
# install_ceilometer_powervm() - Install ceilometer_powervm and necessary dependencies
function install_ceilometer_powervm {
install_pypowervm
if [[ "$INSTALL_PYPOWERVM" == "True" ]]; then
echo_summary "Installing pypowervm"
install_pypowervm
fi
# Install the ceilometer-powervm package
setup_develop $CEILOMETER_POWERVM_DIR
@ -79,7 +82,7 @@ function cleanup_ceilometer_powervm {
if is_service_enabled pvm-ceilometer-acompute; 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

3
devstack/settings
View File

@ -5,7 +5,8 @@
enable_service pvm-ceilometer-acompute
# 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}
# Ceilometer settings