yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cephfs: revert safe-guard check for Luminous

Browse Source 
It's necessary to be on Nautilus before upgrading to 7.x, so the check is no
longer needed. See commit e54c3e3347. It didn't
cleanly revert, because there were cleanups made afterwards.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner
2021-06-16 09:26:59 +02:00
committed by Fabian Grünbichler
parent 3a3ff9d52b
commit 9531988d5e
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
PVE/Storage/CephFSPlugin.pm
View File

@ -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};