Browse code

nova: Use iscsi-initiator-utils 2.1.0 on Fedora 30 and 31

I2f16658c5a3e22cac70912a0f3ad65cdd7071a1e worked around an open-iscsi
bug that remains unpatched in Fedora 30 and 31 by using a private copr
repo with the patch applied. Rawhide has finally been rebased to 2.1.0
where this issue and many others have been resolved.

We can now use a new repo that has been built for Fedora 30 and 31 that
provides this rebased package that we can either use until the rebase is
backported to 31 and 30 or 32 is supported.

Change-Id: I5ba5885bd9c784949602aeb4ddff9d75fecc6b3d

Lee Yarwood authored on 2020/02/07 19:37:08
Showing 1 changed files
... ...
@@ -297,7 +297,7 @@ function configure_nova {
297 297
             fi
298 298
         fi
299 299
 
300
-        if is_fedora && [[ $DISTRO =~ f[0-9][0-9] ]]; then
300
+        if is_fedora && [[ $DISTRO =~ f29 ]]; then
301 301
             # There is an iscsi-initiator bug where it inserts
302 302
             # different whitespace that causes a bunch of output
303 303
             # matching to fail.  We have not been able to get
... ...
@@ -305,6 +305,12 @@ function configure_nova {
305 305
             #  https://bugzilla.redhat.com/show_bug.cgi?id=1676365
306 306
             sudo dnf copr enable -y iwienand/iscsi-initiator-utils
307 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.
312
+            sudo dnf copr enable -y lyarwood/iscsi-initiator-utils
313
+            sudo dnf update -y
308 314
         fi
309 315
 
310 316
         if [[ ${ISCSID_DEBUG} == "True" ]]; then