openstack
/
devstack
Code Issues Proposed changes

Merge "Add f26 to the supported distros"

This commit is contained in:
Jenkins 2017-07-24 14:05:19 +00:00 committed by Gerrit Code Review
parent 31412f5fc6 7bbd4e95d0
commit 0d9c896cdd
6 changed files with 8 additions and 16 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,f24,f25 NOPRIME scsi-target-utils # not:rhel7,f24,f25,f26 NOPRIME
targetcli # dist:rhel7,f24,f25 NOPRIME targetcli # dist:rhel7,f24,f25,f26 NOPRIME

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 f23,f24,f25 iptables-services # NOPRIME f23,f24,f25,f26
java-1.7.0-openjdk-headless # NOPRIME rhel7 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 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:f23,f24,f25 kernel-modules # dist:f23,f24,f25,f26
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:f23,f24,f25 rsync-daemon # dist:f23,f24,f25,f26
sqlite sqlite
xfsprogs xfsprogs
xinetd xinetd

10
lib/nova_plugins/functions-libvirt
View File

@ -73,15 +73,7 @@ function install_libvirt {
#pip_install_gr <there-si-no-guestfs-in-pypi> #pip_install_gr <there-si-no-guestfs-in-pypi>
elif is_fedora || is_suse; then elif is_fedora || is_suse; then
# On "KVM for IBM z Systems", kvm does not have its own package # On "KVM for IBM z Systems", kvm does not have its own package
if [[ ! ${DISTRO} =~ "kvmibm1" && ! ${DISTRO} =~ "rhel7" ]]; then if [[ ! ${DISTRO} =~ "kvmibm1" ]]; 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)
install_package qemu-kvm install_package qemu-kvm
fi fi

2
stack.sh
View File

@ -221,7 +221,7 @@ write_devstack_version
# Warn users who aren't on an explicitly supported distro, but allow them to # Warn users who aren't on an explicitly supported distro, but allow them to
# override check and attempt installation with ``FORCE=yes ./stack`` # 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" echo "WARNING: this script has not been tested on $DISTRO"
if [[ "$FORCE" != "yes" ]]; then if [[ "$FORCE" != "yes" ]]; then
die $LINENO "If you wish to run this script anyway run with FORCE=yes" die $LINENO "If you wish to run this script anyway run with FORCE=yes"