Merge "Disable installing pypowervm by default"
This commit is contained in:
commit
fb6b585c3b
@ -30,6 +30,9 @@ TENANT_VLAN_RANGE=1000:1999
|
|||||||
DISK_DRIVER=localdisk
|
DISK_DRIVER=localdisk
|
||||||
VOL_GRP_NAME=devstackvg
|
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 services (pvm-q-agt and pvm-ceilometer-acompute started by their plugins)
|
||||||
enable_service n-novnc neutron q-svc
|
enable_service n-novnc neutron q-svc
|
||||||
disable_service n-net
|
disable_service n-net
|
||||||
|
@ -34,6 +34,9 @@ TENANT_VLAN_RANGE=1000:1999
|
|||||||
DISK_DRIVER=localdisk
|
DISK_DRIVER=localdisk
|
||||||
VOL_GRP_NAME=devstackvg
|
VOL_GRP_NAME=devstackvg
|
||||||
|
|
||||||
|
# Set to True to install the latest pypowervm from source
|
||||||
|
INSTALL_PYPOWERVM=False
|
||||||
|
|
||||||
NOVA_VNC_ENABLED=True
|
NOVA_VNC_ENABLED=True
|
||||||
NOVNCPROXY_BASE_URL="http://$SERVICE_HOST:6080/vnc_auto.html"
|
NOVNCPROXY_BASE_URL="http://$SERVICE_HOST:6080/vnc_auto.html"
|
||||||
VNCSERVER_LISTEN=$HOST_IP
|
VNCSERVER_LISTEN=$HOST_IP
|
||||||
|
@ -69,7 +69,10 @@ function configure_nova_powervm {
|
|||||||
|
|
||||||
# install_nova_powervm() - Install nova_powervm and necessary dependencies
|
# install_nova_powervm() - Install nova_powervm and necessary dependencies
|
||||||
function install_nova_powervm {
|
function install_nova_powervm {
|
||||||
|
if [[ "$INSTALL_PYPOWERVM" == "True" ]]; then
|
||||||
|
echo_summary "Installing pypowervm"
|
||||||
install_pypowervm
|
install_pypowervm
|
||||||
|
fi
|
||||||
|
|
||||||
# Install the nova-powervm package
|
# Install the nova-powervm package
|
||||||
setup_develop $NOVA_POWERVM_DIR
|
setup_develop $NOVA_POWERVM_DIR
|
||||||
@ -102,7 +105,7 @@ function cleanup_nova_powervm {
|
|||||||
if is_service_enabled nova-powervm; then
|
if is_service_enabled nova-powervm; then
|
||||||
if [[ "$1" == "stack" && "$2" == "pre-install" ]]; then
|
if [[ "$1" == "stack" && "$2" == "pre-install" ]]; then
|
||||||
# Install NovaLink if set
|
# Install NovaLink if set
|
||||||
if [[ "$INSTALL_NOVALINK" == "True" ]]; then
|
if [[ "$INSTALL_NOVALINK" = "True" ]]; then
|
||||||
echo_summary "Installing NovaLink"
|
echo_summary "Installing NovaLink"
|
||||||
install_novalink
|
install_novalink
|
||||||
fi
|
fi
|
||||||
|
@ -5,7 +5,8 @@
|
|||||||
enable_service nova-powervm
|
enable_service nova-powervm
|
||||||
|
|
||||||
# NovaLink install/upgrade settings
|
# 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}
|
PVM_ADMIN_GROUP=${PVM_ADMIN_GROUP:-pvm_admin}
|
||||||
|
|
||||||
# Nova settings
|
# Nova settings
|
||||||
|
Loading…
Reference in New Issue
Block a user