Remove INSTALL_PYPOWERVM
This function is no longer required now that pypowervm is in the global-requirements.txt. Change-Id: I177daf3de95fe20875ed0f48a580fbe6810cd4b7
This commit is contained in:
parent
19d4bf633a
commit
216cb2248c
|
@ -30,9 +30,6 @@ 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
|
||||
|
|
|
@ -34,9 +34,6 @@ 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
|
||||
|
|
|
@ -69,11 +69,6 @@ function configure_nova_powervm {
|
|||
|
||||
# install_nova_powervm() - Install nova_powervm and necessary dependencies
|
||||
function install_nova_powervm {
|
||||
if [[ "$INSTALL_PYPOWERVM" == "True" ]]; then
|
||||
echo_summary "Installing pypowervm"
|
||||
install_pypowervm
|
||||
fi
|
||||
|
||||
# Install the nova-powervm package
|
||||
setup_develop $NOVA_POWERVM_DIR
|
||||
}
|
||||
|
@ -138,7 +133,6 @@ if is_service_enabled nova-powervm; then
|
|||
# clean.sh first calls unstack.sh
|
||||
echo_summary "Cleaning up nova-powervm and associated data"
|
||||
cleanup_nova_powervm
|
||||
cleanup_pypowervm
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -6,7 +6,6 @@ enable_service nova-powervm
|
|||
|
||||
# NovaLink install/upgrade settings
|
||||
INSTALL_NOVALINK=$(trueorfalse False INSTALL_NOVALINK)
|
||||
INSTALL_PYPOWERVM=$(trueorfalse False INSTALL_PYPOWERVM)
|
||||
PVM_ADMIN_GROUP=${PVM_ADMIN_GROUP:-pvm_admin}
|
||||
|
||||
# Nova settings
|
||||
|
|
Loading…
Reference in New Issue