Merge "Allow all versions of Fedora"

Code Issues Proposed changes

This commit is contained in:

Zuul

2018年01月16日 14:26:25 +00:00

committed by Gerrit Code Review

parent 85e277ce19 84068e1526

commit 4795ef87a8

1 changed files with 7 additions and 2 deletions

@@ -268,10 +268,15 @@ function _undefine_virsh_secret {

# check_os_support_ceph() - Check if the OS provides a decent version of Ceph

function check_os_support_ceph {

if [[ ! ${DISTRO} =~ (trusty|xenial|jessie|sid|f24|f25|rhel7) ]]; then

if [[ ! ${DISTRO} =~ f[0-9][0-9] ]]; then

# Assume all versions of Fedora are fine as of 2018.

return

fi

if [[ ! ${DISTRO} =~ (trusty|xenial|jessie|sid|rhel7) ]]; then

echo "WARNING: your distro $DISTRO does not provide \

(at least) the Firefly release. \

Please use Ubuntu Trusty or Fedora 24 (and higher)"

Please use Ubuntu Trusty or Fedora 27 (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, \