openstack/devstack
Code Issues Proposed changes

Update for f29

Browse Source 
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
This commit is contained in:
Artem Goncharov 2018-11-21 15:28:27 +01:00 committed by Jens Harbott
parent c6a4c4547d
commit ba50347526
6 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/rpms/cinder
View File

@ -1,5 +1,5 @@
iscsi-initiator-utils iscsi-initiator-utils
lvm2 lvm2
qemu-img qemu-img
scsi-target-utils # not:rhel7,f25,f26,f27,f28 NOPRIME scsi-target-utils # not:rhel7,f25,f26,f27,f28,f29 NOPRIME
targetcli # dist:rhel7,f25,f26,f27,f28 NOPRIME targetcli # dist:rhel7,f25,f26,f27,f28,f29 NOPRIME

3
files/rpms/dstat
View File

@ -1,2 +1,3 @@
dstat dstat # not:f29
pcp-system-tools # dist:f29
python-psutil python-psutil

4
files/rpms/general
View File

@ -9,9 +9,9 @@ git-core
graphviz # needed only for docs graphviz # needed only for docs
httpd httpd
httpd-devel httpd-devel
iptables-services # NOPRIME f25,f26,f27,f28 iptables-services # NOPRIME f25,f26,f27,f28,f29
java-1.7.0-openjdk-headless # NOPRIME rhel7 java-1.7.0-openjdk-headless # NOPRIME rhel7
java-1.8.0-openjdk-headless # NOPRIME f25,f26,f27,f28 java-1.8.0-openjdk-headless # NOPRIME f25,f26,f27,f28,f29
libffi-devel libffi-devel
libjpeg-turbo-devel # Pillow 3.0.0 libjpeg-turbo-devel # Pillow 3.0.0
libxml2-devel # lxml libxml2-devel # lxml

2
files/rpms/nova
View File

@ -7,7 +7,7 @@ gawk
genisoimage # required for config_drive genisoimage # required for config_drive
iptables iptables
iputils iputils
kernel-modules # dist:f25,f26,f27,f28 kernel-modules # dist:f25,f26,f27,f28,f29
kpartx kpartx
libxml2-python libxml2-python
m2crypto m2crypto

2
files/rpms/swift
View File

@ -2,7 +2,7 @@ curl
liberasurecode-devel liberasurecode-devel
memcached memcached
pyxattr pyxattr
rsync-daemon # dist:f25,f26,f27,f28 rsync-daemon # dist:f25,f26,f27,f28,f29
sqlite sqlite
xfsprogs xfsprogs
xinetd xinetd

10
lib/nova
View File

@ -296,6 +296,16 @@ function configure_nova {
fi fi
fi fi
if is_fedora; 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
# https://bugzilla.redhat.com/show_bug.cgi?id=1676365
sudo dnf copr enable -y iwienand/iscsi-initiator-utils
sudo dnf update -y
fi
if [[ ${ISCSID_DEBUG} == "True" ]]; then if [[ ${ISCSID_DEBUG} == "True" ]]; then
# Install an override that starts iscsid with debugging # Install an override that starts iscsid with debugging
# enabled. # enabled.