From 9531988d5e41a38395de2872a3e95cc472869fbc Mon Sep 17 00:00:00 2001 From: Fabian Ebner Date: Wed, 16 Jun 2021 09:26:59 +0200 Subject: [PATCH] cephfs: revert safe-guard check for Luminous It's necessary to be on Nautilus before upgrading to 7.x, so the check is no longer needed. See commit e54c3e334760491954bc42f3585a8b5b136d4b1d. It didn't cleanly revert, because there were cleanups made afterwards. Signed-off-by: Fabian Ebner --- PVE/Storage/CephFSPlugin.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/PVE/Storage/CephFSPlugin.pm b/PVE/Storage/CephFSPlugin.pm index 480dc57..da64080 100644 --- a/PVE/Storage/CephFSPlugin.pm +++ b/PVE/Storage/CephFSPlugin.pm @@ -98,10 +98,7 @@ sub cephfs_mount { } else { push @opts, "name=$cmd_option->{userid}"; push @opts, "secretfile=$secretfile" if defined($secretfile); - - # FIXME: remove version check in PVE 7.0, only needed for Luminous -> Nautilus - my ($subversions) = PVE::CephConfig::local_ceph_version(); - push @opts, "conf=$configfile" if defined($configfile) && @$subversions[0] > 12; + push @opts, "conf=$configfile" if defined($configfile); } push @opts, $scfg->{options} if $scfg->{options};