1. devstack
  2. Commit ba50347526ea76b501dacf774ea6f0997361358c
Browse code

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

Artem Goncharov authored on 2018/11/21 23:28:27
Showing 6 changed files
files/rpms/cinder
History View file @ ba50347
... ... 
@@ -1,5 +1,5 @@
1 1 
 iscsi-initiator-utils
2 2 
 lvm2
3 3 
 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
History View file @ ba50347
... ... 
@@ -1,2 +1,3 @@
1 
-dstat
1 
+dstat # not:f29
2 
+pcp-system-tools # dist:f29
2 3 
 python-psutil
files/rpms/general
History View file @ ba50347
... ... 
@@ -9,9 +9,9 @@ git-core
9 9 
 graphviz # needed only for docs
10 10 
 httpd
11 11 
 httpd-devel
12 
-iptables-services  # NOPRIME f25,f26,f27,f28
12 
+iptables-services  # NOPRIME f25,f26,f27,f28,f29
13 13 
 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
15 15 
 libffi-devel
16 16 
 libjpeg-turbo-devel # Pillow 3.0.0
17 17 
 libxml2-devel # lxml
files/rpms/nova
History View file @ ba50347
... ... 
@@ -7,7 +7,7 @@ gawk
7 7 
 genisoimage # required for config_drive
8 8 
 iptables
9 9 
 iputils
10 
-kernel-modules # dist:f25,f26,f27,f28
10 
+kernel-modules # dist:f25,f26,f27,f28,f29
11 11 
 kpartx
12 12 
 libxml2-python
13 13 
 m2crypto
files/rpms/swift
History View file @ ba50347
... ... 
@@ -2,7 +2,7 @@ curl
2 2 
 liberasurecode-devel
3 3 
 memcached
4 4 
 pyxattr
5 
-rsync-daemon # dist:f25,f26,f27,f28
5 
+rsync-daemon # dist:f25,f26,f27,f28,f29
6 6 
 sqlite
7 7 
 xfsprogs
8 8 
 xinetd
lib/nova
History View file @ ba50347
... ... 
@@ -296,6 +296,16 @@ function configure_nova {
296 296 
             fi
297 297 
         fi
298 298
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 
+
299 309 
         if [[ ${ISCSID_DEBUG} == "True" ]]; then
300 310 
             # Install an override that starts iscsid with debugging
301 311 
             # enabled.