Skip to content

Commit ba50347

Browse files
gtemajharbott
authored andcommitted
Update for f29
In Fedora 29 dstat was merged with pcp-system-tools (see https://pagure.io/fesco/issue/1956) Work around a iscsi bug with external packages until we can get the package fixed. Obsolete F27 Change-Id: I2f16658c5a3e22cac70912a0f3ad65cdd7071a1e
1 parent c6a4c45 commit ba50347

6 files changed

Lines changed: 18 additions & 7 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 NOPRIME
5-
targetcli # dist:rhel7,f25,f26,f27,f28 NOPRIME
4+
scsi-target-utils # not:rhel7,f25,f26,f27,f28,f29 NOPRIME
5+
targetcli # dist:rhel7,f25,f26,f27,f28,f29 NOPRIME

files/rpms/dstat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
dstat
1+
dstat # not:f29
2+
pcp-system-tools # dist:f29
23
python-psutil

files/rpms/general

Lines changed: 2 additions & 2 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
12+
iptables-services # NOPRIME f25,f26,f27,f28,f29
1313
java-1.7.0-openjdk-headless # NOPRIME rhel7
14-
java-1.8.0-openjdk-headless # NOPRIME f25,f26,f27,f28
14+
java-1.8.0-openjdk-headless # NOPRIME f25,f26,f27,f28,f29
1515
libffi-devel
1616
libjpeg-turbo-devel # Pillow 3.0.0
1717
libxml2-devel # lxml

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
10+
kernel-modules # dist:f25,f26,f27,f28,f29
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
5+
rsync-daemon # dist:f25,f26,f27,f28,f29
66
sqlite
77
xfsprogs
88
xinetd

lib/nova

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,16 @@ function configure_nova {
296296
fi
297297
fi
298298

299+
if is_fedora; then
300+
# There is an iscsi-initiator bug where it inserts
301+
# different whitespace that causes a bunch of output
302+
# matching to fail. We have not been able to get
303+
# fixed, yet :/ Exists in fedora 29 & 30
304+
# https://bugzilla.redhat.com/show_bug.cgi?id=1676365
305+
sudo dnf copr enable -y iwienand/iscsi-initiator-utils
306+
sudo dnf update -y
307+
fi
308+
299309
if [[ ${ISCSID_DEBUG} == "True" ]]; then
300310
# Install an override that starts iscsid with debugging
301311
# enabled.

0 commit comments

Comments
 (0)