Skip to content

Commit 7bbd4e9

Browse files
committed
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
1 parent d93433d commit 7bbd4e9

6 files changed

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

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 f23,f24,f25
12+
iptables-services # NOPRIME f23,f24,f25,f26
1313
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
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:f23,f24,f25
10+
kernel-modules # dist:f23,f24,f25,f26
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:f23,f24,f25
5+
rsync-daemon # dist:f23,f24,f25,f26
66
sqlite
77
xfsprogs
88
xinetd

lib/nova_plugins/functions-libvirt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,7 @@ function install_libvirt {
7373
#pip_install_gr <there-si-no-guestfs-in-pypi>
7474
elif is_fedora || is_suse; then
7575
# 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
8577
install_package qemu-kvm
8678
fi
8779

stack.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ write_devstack_version
221221

222222
# Warn users who aren't on an explicitly supported distro, but allow them to
223223
# 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
225225
echo "WARNING: this script has not been tested on $DISTRO"
226226
if [[ "$FORCE" != "yes" ]]; then
227227
die $LINENO "If you wish to run this script anyway run with FORCE=yes"

0 commit comments

Comments
 (0)