Remove redundant Fedora version check

Code Issues Proposed changes

Seems a trace from older code. It doesn't make
much sense to allow all Fedora versions that
matches f[0-9][0-9] and then check for specific
Fedora versions in the following lines.
Remove this check and just allow some specific
versions
Change-Id: Ie14a453f96689f574f1b388ab8f6e5467a59b7f7

This commit is contained in:

Victoria Martinez de la Cruz

2021年06月18日 15:43:58 +00:00

parent 36b15031e9

commit 503781a9f8

1 changed files with 3 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

11
devstack/lib/ceph

View File

@@ -270,16 +270,11 @@ 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} =~ f[0-9][0-9] ]]; then

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

return

fi

if [[ ! ${DISTRO} =~ (focal|bionic|xenial|f31|f32) ]]; then

if [[ ! ${DISTRO} =~ (focal|bionic|xenial|f31|f32|f33|f34) ]]; then

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

(at least) the Luminous release. \

Please use Ubuntu Xenial, Ubuntu Bionic, Ubuntu Focal,

Fedora 31 or Fedora 32"

Please use Ubuntu Xenial, Ubuntu Bionic, Ubuntu Focal or

Fedora 31-34"

if [[ "$FORCE_CEPH_INSTALL" != "yes" ]]; then

die $LINENO "If you wish to install Ceph on this distribution \

anyway run with FORCE_CEPH_INSTALL=yes, \

Remove redundant Fedora version check

11 devstack/lib/ceph Unescape Escape View File

11
devstack/lib/ceph

View File