Browse code

Add f26 to the supported distros

The only mentionable diff is the kvm alias
does not exists so we will install
qemu-kvm as with rhel7 which also exists
in the older supported fedoras.

kvm also just an alias in suse so
switching to qemu-kvm in suse as well.

Change-Id: I5c79ad1ef0b11dba30c931a59786f9eb7e7f8587

Attila Fazekas authored on 2017/07/13 22:12:55
Showing 6 changed files
... ...
@@ -1,5 +1,5 @@
1 1
 iscsi-initiator-utils
2 2
 lvm2
3 3
 qemu-img
4
-scsi-target-utils # not:rhel7,f24,f25 NOPRIME
5
-targetcli # dist:rhel7,f24,f25 NOPRIME
6 4
\ No newline at end of file
5
+scsi-target-utils # not:rhel7,f24,f25,f26 NOPRIME
6
+targetcli # dist:rhel7,f24,f25,f26 NOPRIME
... ...
@@ -9,9 +9,9 @@ git-core
9 9
 graphviz # needed only for docs
10 10
 httpd
11 11
 httpd-devel
12
-iptables-services  # NOPRIME f23,f24,f25
12
+iptables-services  # NOPRIME f23,f24,f25,f26
13 13
 java-1.7.0-openjdk-headless  # NOPRIME rhel7
14
-java-1.8.0-openjdk-headless  # NOPRIME f23,f24,f25
14
+java-1.8.0-openjdk-headless  # NOPRIME f23,f24,f25,f26
15 15
 libffi-devel
16 16
 libjpeg-turbo-devel # Pillow 3.0.0
17 17
 libxml2-devel # lxml
... ...
@@ -7,7 +7,7 @@ gawk
7 7
 genisoimage # required for config_drive
8 8
 iptables
9 9
 iputils
10
-kernel-modules # dist:f23,f24,f25
10
+kernel-modules # dist:f23,f24,f25,f26
11 11
 kpartx
12 12
 libxml2-python
13 13
 m2crypto
... ...
@@ -2,7 +2,7 @@ curl
2 2
 liberasurecode-devel
3 3
 memcached
4 4
 pyxattr
5
-rsync-daemon # dist:f23,f24,f25
5
+rsync-daemon # dist:f23,f24,f25,f26
6 6
 sqlite
7 7
 xfsprogs
8 8
 xinetd
... ...
@@ -73,15 +73,7 @@ function install_libvirt {
73 73
         #pip_install_gr <there-si-no-guestfs-in-pypi>
74 74
     elif is_fedora || is_suse; then
75 75
         # On "KVM for IBM z Systems", kvm does not have its own package
76
-        if [[ ! ${DISTRO} =~ "kvmibm1" && ! ${DISTRO} =~ "rhel7" ]]; then
77
-            install_package kvm
78
-        fi
79
-
80
-        if [[ ${DISTRO} =~ "rhel7" ]]; then
81
-            # This should install the latest qemu-kvm build,
82
-            # which is called qemu-kvm-ev in centos7
83
-            # (as the default OS qemu-kvm package is usually rather old,
84
-            # and should be updated by above)
76
+        if [[ ! ${DISTRO} =~ "kvmibm1" ]]; then
85 77
             install_package qemu-kvm
86 78
         fi
87 79
 
... ...
@@ -221,7 +221,7 @@ write_devstack_version
221 221
 
222 222
 # Warn users who aren't on an explicitly supported distro, but allow them to
223 223
 # override check and attempt installation with ``FORCE=yes ./stack``
224
-if [[ ! ${DISTRO} =~ (xenial|yakkety|zesty|stretch|jessie|f24|f25|opensuse-42.2|opensuse-42.3|rhel7|kvmibm1) ]]; then
224
+if [[ ! ${DISTRO} =~ (xenial|yakkety|zesty|stretch|jessie|f24|f25|f26|opensuse-42.2|opensuse-42.3|rhel7|kvmibm1) ]]; then
225 225
     echo "WARNING: this script has not been tested on $DISTRO"
226 226
     if [[ "$FORCE" != "yes" ]]; then
227 227
         die $LINENO "If you wish to run this script anyway run with FORCE=yes"