From f966e287396538a563d80827dc7b77438e32eb6c Mon Sep 17 00:00:00 2001
From: Lee Yarwood <lyarwood@redhat.com>
Date: Thu, 24 Sep 2020 14:47:39 +0100
Subject: [PATCH] Remove Fedora 30 support
Fedora 30 hit EOL earlier in the year and can be removed from devstack.
https://en.wikipedia.org/wiki/Fedora_version_history#Version_history
Change-Id: I47452700d520a544c93c0c187143ec763f026612
---
lib/lvm | 6 ------
lib/nova | 4 ++--
stack.sh | 2 +-
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/lib/lvm b/lib/lvm
index 92265f2af2..b826c1bc63 100644
--- a/lib/lvm
+++ b/lib/lvm
@@ -124,12 +124,6 @@ function init_lvm_volume_group {
local vg=$1
local size=$2
- # Start the lvmetad on f30 (dropped from f31) or SUSE
- if [[ $DISTRO =~ f30 ]] || is_suse; then
- # services is not started by default
- start_service lvm2-lvmetad
- fi
-
# Start the tgtd service on Fedora and SUSE if tgtadm is used
if is_fedora || is_suse && [[ "$CINDER_ISCSI_HELPER" = "tgtadm" ]]; then
start_service tgtd
diff --git a/lib/nova b/lib/nova
index c1354e79a9..9d7bbd8fca 100644
--- a/lib/nova
+++ b/lib/nova
@@ -293,8 +293,8 @@ function configure_nova {
fi
fi
- if is_fedora && [[ $DISTRO =~ f3[0-1] ]]; then
- # For f30 and f31 use the rebased 2.1.0 version of the package.
+ if is_fedora && [[ $DISTRO =~ f31] ]]; then
+ # For f31 use the rebased 2.1.0 version of the package.
sudo dnf copr enable -y lyarwood/iscsi-initiator-utils
sudo dnf update -y
fi
diff --git a/stack.sh b/stack.sh
index 5f9b553536..139e754a63 100755
--- a/stack.sh
+++ b/stack.sh
@@ -221,7 +221,7 @@ write_devstack_version
# 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} =~ (bionic|focal|f30|f31|f32|opensuse-15.0|opensuse-15.1|opensuse-tumbleweed|rhel8) ]]; then
+if [[ ! ${DISTRO} =~ (bionic|focal|f31|f32|opensuse-15.0|opensuse-15.1|opensuse-tumbleweed|rhel8) ]]; 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"