Skip to content

Commit 347abd4

Browse files
committed
Drop Fedora 29 support
With fedora-latest now using Fedora 30 images and Fedora 29 itself EOL we can now remove support for it from devstack. This change also cleans up references to earlier Fedora releases under files/rpms/. Change-Id: I24332f7016ebb549ea678acf677c477b55ec4d4b
1 parent 1d1f53d commit 347abd4

7 files changed

Lines changed: 12 additions & 22 deletions

File tree

files/rpms/cinder

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
iscsi-initiator-utils
22
lvm2
33
qemu-img
4-
scsi-target-utils # not:rhel7,f25,f26,f27,f28,f29,f30 NOPRIME
5-
targetcli # dist:rhel7,f25,f26,f27,f28,f29,f30 NOPRIME
4+
scsi-target-utils # not:rhel7,f30 NOPRIME
5+
targetcli # dist:rhel7,f30 NOPRIME

files/rpms/dstat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
dstat # not:f29,f30
2-
pcp-system-tools # dist:f29,f30
1+
dstat # not:f30
2+
pcp-system-tools # dist:f30

files/rpms/general

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ git-core
99
graphviz # needed only for docs
1010
httpd
1111
httpd-devel
12-
iptables-services # NOPRIME f25,f26,f27,f28,f29,f30
12+
iptables-services # NOPRIME f30
1313
java-1.7.0-openjdk-headless # NOPRIME rhel7
14-
java-1.8.0-openjdk-headless # NOPRIME f25,f26,f27,f28,f29,f30
14+
java-1.8.0-openjdk-headless # NOPRIME f30
1515
libffi-devel
1616
libjpeg-turbo-devel # Pillow 3.0.0
1717
libxml2-devel # lxml
@@ -27,7 +27,7 @@ pkgconfig
2727
postgresql-devel # psycopg2
2828
psmisc
2929
pyOpenSSL # version in pip uses too much memory
30-
python3-devel # f29,f30
30+
python3-devel # f30
3131
python-devel
3232
redhat-rpm-config # missing dep for gcc hardening flags, see rhbz#1217376
3333
systemd-devel # for systemd-python

files/rpms/nova

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gawk
77
genisoimage # required for config_drive
88
iptables
99
iputils
10-
kernel-modules # dist:f25,f26,f27,f28,f29,f30
10+
kernel-modules # dist:f30
1111
kpartx
1212
libxml2-python
1313
m2crypto

files/rpms/swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ curl
22
liberasurecode-devel
33
memcached
44
pyxattr
5-
rsync-daemon # dist:f25,f26,f27,f28,f29,f30
5+
rsync-daemon # dist:f30
66
sqlite
77
xfsprogs
88
xinetd

lib/nova

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -297,18 +297,8 @@ function configure_nova {
297297
fi
298298
fi
299299

300-
if is_fedora && [[ $DISTRO =~ f29 ]]; then
301-
# There is an iscsi-initiator bug where it inserts
302-
# different whitespace that causes a bunch of output
303-
# matching to fail. We have not been able to get
304-
# fixed, yet :/ Exists in fedora 29 & 30 at least
305-
# https://bugzilla.redhat.com/show_bug.cgi?id=1676365
306-
sudo dnf copr enable -y iwienand/iscsi-initiator-utils
307-
sudo dnf update -y
308-
elif is_fedora && [[ $DISTRO =~ f3[0-1] ]]; then
309-
# For f30 and f31 use the rebased 2.1.0 version of the package. We
310-
# can't use this above as f29 is EOL and as a result we can't
311-
# rebuild packages in copr for it.
300+
if is_fedora && [[ $DISTRO =~ f3[0-1] ]]; then
301+
# For f30 and f31 use the rebased 2.1.0 version of the package.
312302
sudo dnf copr enable -y lyarwood/iscsi-initiator-utils
313303
sudo dnf update -y
314304
fi

stack.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ write_devstack_version
221221

222222
# Warn users who aren't on an explicitly supported distro, but allow them to
223223
# override check and attempt installation with ``FORCE=yes ./stack``
224-
if [[ ! ${DISTRO} =~ (bionic|stretch|jessie|f29|f30|opensuse-15.0|opensuse-15.1|opensuse-tumbleweed|rhel7) ]]; then
224+
if [[ ! ${DISTRO} =~ (bionic|stretch|jessie|f30|opensuse-15.0|opensuse-15.1|opensuse-tumbleweed|rhel7) ]]; then
225225
echo "WARNING: this script has not been tested on $DISTRO"
226226
if [[ "$FORCE" != "yes" ]]; then
227227
die $LINENO "If you wish to run this script anyway run with FORCE=yes"

0 commit comments

Comments
 (0)