Merge "Remove support for End Of Life (EOL) Fedora 22"

This commit is contained in:
Jenkins 2016-07-14 23:38:46 +00:00 committed by Gerrit Code Review
commit 5f50d1931a
5 changed files with 6 additions and 6 deletions

View File

@ -7,9 +7,9 @@ gcc-c++
gettext # used for compiling message catalogs
git-core
graphviz # needed only for docs
iptables-services # NOPRIME f22,f23,f24
iptables-services # NOPRIME f23,f24
java-1.7.0-openjdk-headless # NOPRIME rhel7
java-1.8.0-openjdk-headless # NOPRIME f22,f23,f24
java-1.8.0-openjdk-headless # NOPRIME f23,f24
libffi-devel
libjpeg-turbo-devel # Pillow 3.0.0
libxml2-devel # lxml

View File

@ -7,7 +7,7 @@ gawk
genisoimage # required for config_drive
iptables
iputils
kernel-modules # dist:f22,f23,f24
kernel-modules # dist:f23,f24
kpartx
kvm # NOPRIME
libvirt-bin # NOPRIME

View File

@ -2,7 +2,7 @@ curl
liberasurecode-devel
memcached
pyxattr
rsync-daemon # dist:f22,f23,f24
rsync-daemon # dist:f23,f24
sqlite
xfsprogs
xinetd

View File

@ -116,7 +116,7 @@ function undefine_virsh_secret {
# check_os_support_ceph() - Check if the operating system provides a decent version of Ceph
function check_os_support_ceph {
if [[ ! ${DISTRO} =~ (trusty|f22|f23|f24) ]]; then
if [[ ! ${DISTRO} =~ (trusty|f23|f24) ]]; then
echo "WARNING: your distro $DISTRO does not provide (at least) the Firefly release. Please use Ubuntu Trusty or Fedora 20 (and higher)"
if [[ "$FORCE_CEPH_INSTALL" != "yes" ]]; then
die $LINENO "If you wish to install Ceph on this distribution anyway run with FORCE_CEPH_INSTALL=yes"

View File

@ -185,7 +185,7 @@ source $TOP_DIR/stackrc
# 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} =~ (trusty|wily|xenial|7.0|wheezy|sid|testing|jessie|f22|f23|f24|rhel7|kvmibm1) ]]; then
if [[ ! ${DISTRO} =~ (trusty|wily|xenial|7.0|wheezy|sid|testing|jessie|f23|f24|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"