From 1a46c898db9c16173013d95e2bc954992121077c Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 20 Sep 2019 08:11:08 +1000 Subject: [PATCH] Restrict iscsi package hack to Fedora I forgot in I2f16658c5a3e22cac70912a0f3ad65cdd7071a1e that "is_fedora" matches rhel/centos for historical reasons. Restrict the install to just the Fedora platforms by checking DISTRO matches Change-Id: Ica4a690a4f2894a03ceb8557a947ed2ea4a60e53 --- lib/nova | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/nova b/lib/nova index c8e6164916..c41f881fa1 100644 --- a/lib/nova +++ b/lib/nova @@ -296,11 +296,11 @@ function configure_nova { fi fi - if is_fedora; then + if is_fedora && [[ $DISTRO =~ f[0-9][0-9] ]]; 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 + # 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