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 <f.ebner@proxmox.com>

diff --git a/PVE/Storage/CephFSPlugin.pm b/PVE/Storage/CephFSPlugin.pm
index 480dc57727d187578b940466a815f1118eb9226f..da64080d1bc9819a100b20d8b1402303e551e607 100644 (file)
--- 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};