From ff10ac318ce4be49d8bceafb7fea92ae1655b497 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Mon, 13 Feb 2017 12:44:24 -0500 Subject: [PATCH] Remove distro support based on new libvirt minimum Nova is going to increase the minimum required libvirt in Pike to 1.2.9 in change: I9a972e3fde2e4e552f6fc98350820c07873c3de3 Based on the libvirt distro support matrix wiki [1] that drops support for Ubuntu Trusty and Debian 7.0/Wheezy. Trusty has libvirt 1.2.2 and Wheezy has 0.9.12 (the Wheezy support should have been removed long ago apparently). The 7.0 removed here is for Wheezy also based on commit b2ef890db3d78b24f9da2f4dd80502165c669ad0. This does not undo the check for "trusty" with the EBTABLES_RACE_FIX in lib/nova_plugins/function-libvirt since you can still force devstack to run on Trusty if you specify the FORCE=yes variable. Note that RHEL 7.1 has libvirt 1.2.8 so it won't technically work with devstack and nova + pike + libvirt, but with the way os_RELEASE is calculated the minor version is dropped for RHEL distros so we just get "rhel7". Also note that this doesn't attempt to continue supporting Trusty or Wheezy if nova is not configured to use libvirt, simply in order to start moving forward on devstack distro support in general and to keep some sanity and closeness to what we test with in the CI system. While we're in here, we also drop Fedora 23 and add Ubuntu Zesty. [1] https://wiki.openstack.org/wiki/LibvirtDistroSupportMatrix Depends-On: I9a972e3fde2e4e552f6fc98350820c07873c3de3 Depends-On: If69f99bd789e646b0261e27a8a061efde32436f7 Change-Id: I6617283afd798af37e64913b7865cea3c8a62aba --- functions-common | 4 ++-- stack.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/functions-common b/functions-common index 8d32bb4148..f4171049c0 100644 --- a/functions-common +++ b/functions-common @@ -302,9 +302,9 @@ function warn { # such as "install_package" further abstract things in better ways. # # ``os_VENDOR`` - vendor name: ``Ubuntu``, ``Fedora``, etc -# ``os_RELEASE`` - major release: ``14.04`` (Ubuntu), ``20`` (Fedora) +# ``os_RELEASE`` - major release: ``16.04`` (Ubuntu), ``23`` (Fedora) # ``os_PACKAGE`` - package type: ``deb`` or ``rpm`` -# ``os_CODENAME`` - vendor's codename for release: ``trusty`` +# ``os_CODENAME`` - vendor's codename for release: ``xenial`` declare os_VENDOR os_RELEASE os_PACKAGE os_CODENAME diff --git a/stack.sh b/stack.sh index 7d440a7c20..02bcc58c0a 100755 --- a/stack.sh +++ b/stack.sh @@ -12,7 +12,7 @@ # a multi-node developer install. # To keep this script simple we assume you are running on a recent **Ubuntu** -# (14.04 Trusty or newer), **Fedora** (F20 or newer), or **CentOS/RHEL** +# (16.04 Xenial or newer), **Fedora** (F24 or newer), or **CentOS/RHEL** # (7 or newer) machine. (It may work on other platforms but support for those # platforms is left to those who added them to DevStack.) It should work in # a VM or physical server. Additionally, we maintain a list of ``deb`` and @@ -192,7 +192,7 @@ source $TOP_DIR/stackrc # Warn users who aren't on an explicitly supported distro, but allow them to # override check and attempt installation with ``FORCE=yes ./stack`` -if [[ ! ${DISTRO} =~ (trusty|xenial|yakkety|7.0|wheezy|sid|testing|jessie|f23|f24|f25|rhel7|kvmibm1) ]]; then +if [[ ! ${DISTRO} =~ (xenial|yakkety|zesty|sid|testing|jessie|f24|f25|rhel7|kvmibm1) ]]; then echo "WARNING: this script has not been tested on $DISTRO" if [[ "$FORCE" != "yes" ]]; then die $LINENO "If you wish to run this script anyway run with FORCE=yes"