@@ -1,5 +1,5 @@

 iscsi-initiator-utils

 lvm2

 qemu-img

-scsi-target-utils # not:rhel7,f25,f26,f27,f28,f29,f30 NOPRIME

-targetcli # dist:rhel7,f25,f26,f27,f28,f29,f30 NOPRIME

+scsi-target-utils # not:rhel7,f30 NOPRIME

+targetcli # dist:rhel7,f30 NOPRIME

@@ -1,2 +1,2 @@

-dstat # not:f29,f30

-pcp-system-tools # dist:f29,f30

+dstat # not:f30

+pcp-system-tools # dist:f30

@@ -9,9 +9,9 @@ git-core

 graphviz # needed only for docs

 httpd

 httpd-devel

-iptables-services  # NOPRIME f25,f26,f27,f28,f29,f30

+iptables-services  # NOPRIME f30

 java-1.7.0-openjdk-headless  # NOPRIME rhel7

-java-1.8.0-openjdk-headless  # NOPRIME f25,f26,f27,f28,f29,f30

+java-1.8.0-openjdk-headless  # NOPRIME f30

 libffi-devel

 libjpeg-turbo-devel # Pillow 3.0.0

 libxml2-devel # lxml

@@ -27,7 +27,7 @@ pkgconfig

 postgresql-devel  # psycopg2

 psmisc

 pyOpenSSL # version in pip uses too much memory

-python3-devel # f29,f30

+python3-devel # f30

 python-devel

 redhat-rpm-config # missing dep for gcc hardening flags, see rhbz#1217376

 systemd-devel # for systemd-python

@@ -7,7 +7,7 @@ gawk

 genisoimage # required for config_drive

 iptables

 iputils

-kernel-modules # dist:f25,f26,f27,f28,f29,f30

+kernel-modules # dist:f30

 kpartx

 libxml2-python

 m2crypto

@@ -2,7 +2,7 @@ curl

 liberasurecode-devel

 memcached

 pyxattr

-rsync-daemon # dist:f25,f26,f27,f28,f29,f30

+rsync-daemon # dist:f30

 sqlite

 xfsprogs

 xinetd

@@ -297,18 +297,8 @@ function configure_nova {

             fi

         fi

-        if is_fedora && [[ $DISTRO =~ f29 ]]; then

-            # There is an iscsi-initiator bug where it inserts

-            # different whitespace that causes a bunch of output

-            # matching to fail.  We have not been able to get

-            # fixed, yet :/  Exists in fedora 29 & 30 at least

-            #  https://bugzilla.redhat.com/show_bug.cgi?id=1676365

-            sudo dnf copr enable -y iwienand/iscsi-initiator-utils

-            sudo dnf update -y

-        elif is_fedora && [[ $DISTRO =~ f3[0-1] ]]; then

-            # For f30 and f31 use the rebased 2.1.0 version of the package. We

-            # can't use this above as f29 is EOL and as a result we can't

-            # rebuild packages in copr for it.

+        if is_fedora && [[ $DISTRO =~ f3[0-1] ]]; then

+            # For f30 and 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

@@ -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|stretch|jessie|f29|f30|opensuse-15.0|opensuse-15.1|opensuse-tumbleweed|rhel7) ]]; then

+if [[ ! ${DISTRO} =~ (bionic|stretch|jessie|f30|opensuse-15.0|opensuse-15.1|opensuse-tumbleweed|rhel7) ]]; 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"