diff --git a/files/rpms/cinder b/files/rpms/cinder index 2c7b45baaf..3bc4e7ae72 100644 --- a/files/rpms/cinder +++ b/files/rpms/cinder @@ -1,5 +1,5 @@ iscsi-initiator-utils lvm2 qemu-img -scsi-target-utils # not:rhel7,f24,f25 NOPRIME -targetcli # dist:rhel7,f24,f25 NOPRIME \ No newline at end of file +scsi-target-utils # not:rhel7,f24,f25,f26 NOPRIME +targetcli # dist:rhel7,f24,f25,f26 NOPRIME diff --git a/files/rpms/general b/files/rpms/general index 1393d18328..2443cc8cd7 100644 --- a/files/rpms/general +++ b/files/rpms/general @@ -9,9 +9,9 @@ git-core graphviz # needed only for docs httpd httpd-devel -iptables-services # NOPRIME f23,f24,f25 +iptables-services # NOPRIME f23,f24,f25,f26 java-1.7.0-openjdk-headless # NOPRIME rhel7 -java-1.8.0-openjdk-headless # NOPRIME f23,f24,f25 +java-1.8.0-openjdk-headless # NOPRIME f23,f24,f25,f26 libffi-devel libjpeg-turbo-devel # Pillow 3.0.0 libxml2-devel # lxml diff --git a/files/rpms/nova b/files/rpms/nova index a368c552aa..632e796d07 100644 --- a/files/rpms/nova +++ b/files/rpms/nova @@ -7,7 +7,7 @@ gawk genisoimage # required for config_drive iptables iputils -kernel-modules # dist:f23,f24,f25 +kernel-modules # dist:f23,f24,f25,f26 kpartx libxml2-python m2crypto diff --git a/files/rpms/swift b/files/rpms/swift index 2f12df0e3b..2e09cec28f 100644 --- a/files/rpms/swift +++ b/files/rpms/swift @@ -2,7 +2,7 @@ curl liberasurecode-devel memcached pyxattr -rsync-daemon # dist:f23,f24,f25 +rsync-daemon # dist:f23,f24,f25,f26 sqlite xfsprogs xinetd diff --git a/lib/nova_plugins/functions-libvirt b/lib/nova_plugins/functions-libvirt index 3e38b898ec..8d74c77517 100644 --- a/lib/nova_plugins/functions-libvirt +++ b/lib/nova_plugins/functions-libvirt @@ -73,15 +73,7 @@ function install_libvirt { #pip_install_gr elif is_fedora || is_suse; then # On "KVM for IBM z Systems", kvm does not have its own package - if [[ ! ${DISTRO} =~ "kvmibm1" && ! ${DISTRO} =~ "rhel7" ]]; then - install_package kvm - fi - - if [[ ${DISTRO} =~ "rhel7" ]]; then - # This should install the latest qemu-kvm build, - # which is called qemu-kvm-ev in centos7 - # (as the default OS qemu-kvm package is usually rather old, - # and should be updated by above) + if [[ ! ${DISTRO} =~ "kvmibm1" ]]; then install_package qemu-kvm fi diff --git a/stack.sh b/stack.sh index 018ed3e3cc..391f272cd8 100755 --- a/stack.sh +++ b/stack.sh @@ -221,7 +221,7 @@ write_devstack_version # Warn users who aren't on an explicitly supported distro, but allow them to # override check and attempt installation with ``FORCE=yes ./stack`` -if [[ ! ${DISTRO} =~ (xenial|yakkety|zesty|stretch|jessie|f24|f25|opensuse-42.2|opensuse-42.3|rhel7|kvmibm1) ]]; then +if [[ ! ${DISTRO} =~ (xenial|yakkety|zesty|stretch|jessie|f24|f25|f26|opensuse-42.2|opensuse-42.3|rhel7|kvmibm1) ]]; then echo "WARNING: this script has not been tested on $DISTRO" if [[ "$FORCE" != "yes" ]]; then die $LINENO "If you wish to run this script anyway run with FORCE=yes"