openstack/devstack
Code Issues Proposed changes

Merge "Drop support for "kvmibm" distro"

Browse Source
This commit is contained in:
Zuul 2017-11-15 00:05:24 +00:00 committed by Gerrit Code Review
commit 2647fc2ac1
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functions-common
View File

@ -386,8 +386,6 @@ function GetDistro {
DISTRO="rhel${os_RELEASE::1}" DISTRO="rhel${os_RELEASE::1}"
elif [[ "$os_VENDOR" =~ (XenServer) ]]; then elif [[ "$os_VENDOR" =~ (XenServer) ]]; then
DISTRO="xs${os_RELEASE%.*}" DISTRO="xs${os_RELEASE%.*}"
elif [[ "$os_VENDOR" =~ (kvmibm) ]]; then
DISTRO="${os_VENDOR}${os_RELEASE::1}"
else else
# We can't make a good choice here. Setting a sensible DISTRO # We can't make a good choice here. Setting a sensible DISTRO
# is part of the problem, but not the major issue -- we really # is part of the problem, but not the major issue -- we really
@ -441,7 +439,7 @@ function is_fedora {
[ "$os_VENDOR" = "Fedora" ] || [ "$os_VENDOR" = "Red Hat" ] || \ [ "$os_VENDOR" = "Fedora" ] || [ "$os_VENDOR" = "Red Hat" ] || \
[ "$os_VENDOR" = "RedHatEnterpriseServer" ] || \ [ "$os_VENDOR" = "RedHatEnterpriseServer" ] || \
[ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "OracleServer" ] || \ [ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "OracleServer" ] || \
[ "$os_VENDOR" = "Virtuozzo" ] || [ "$os_VENDOR" = "kvmibm" ] [ "$os_VENDOR" = "Virtuozzo" ]
} }

5
lib/nova_plugins/functions-libvirt
View File

@ -72,11 +72,6 @@ function install_libvirt {
pip_install_gr libvirt-python pip_install_gr libvirt-python
#pip_install_gr <there-si-no-guestfs-in-pypi> #pip_install_gr <there-si-no-guestfs-in-pypi>
elif is_fedora || is_suse; then elif is_fedora || is_suse; then
# On "KVM for IBM z Systems", kvm does not have its own package
if [[ ! ${DISTRO} =~ "kvmibm1" ]]; then
install_package qemu-kvm
fi
install_package libvirt libvirt-devel install_package libvirt libvirt-devel
pip_uninstall libvirt-python pip_uninstall libvirt-python
pip_install_gr libvirt-python pip_install_gr libvirt-python

2
stack.sh
View File

@ -221,7 +221,7 @@ write_devstack_version
# Warn users who aren't on an explicitly supported distro, but allow them to # Warn users who aren't on an explicitly supported distro, but allow them to
# override check and attempt installation with ``FORCE=yes ./stack`` # override check and attempt installation with ``FORCE=yes ./stack``
if [[ ! ${DISTRO} =~ (xenial|yakkety|zesty|stretch|jessie|f24|f25|f26|opensuse-42.2|opensuse-42.3|rhel7|kvmibm1) ]]; then if [[ ! ${DISTRO} =~ (xenial|yakkety|zesty|stretch|jessie|f24|f25|f26|opensuse-42.2|opensuse-42.3|rhel7) ]]; then
echo "WARNING: this script has not been tested on $DISTRO" echo "WARNING: this script has not been tested on $DISTRO"
if [[ "$FORCE" != "yes" ]]; then if [[ "$FORCE" != "yes" ]]; then
die $LINENO "If you wish to run this script anyway run with FORCE=yes" die $LINENO "If you wish to run this script anyway run with FORCE=yes"