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

cephfs: add support for multiple ceph filesystems

Browse Source 
by optionally saving the name of the cephfs

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak
2021-10-25 16:01:27 +02:00
committed by Thomas Lamprecht
parent 85043c0193
commit bc7fecb082
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/Storage/CephFSPlugin.pm
View File

@ -87,6 +87,7 @@ sub cephfs_mount {
my $secretfile = $cmd_option->{keyring}; my $secretfile = $cmd_option->{keyring};
my $server = $cmd_option->{mon_host} // PVE::CephConfig::get_monaddr_list($configfile); my $server = $cmd_option->{mon_host} // PVE::CephConfig::get_monaddr_list($configfile);
my $type = 'ceph'; my $type = 'ceph';
my $fs_name = $scfg->{'fs-name'};
my @opts = (); my @opts = ();
if ($scfg->{fuse}) { if ($scfg->{fuse}) {
@ -94,10 +95,12 @@ sub cephfs_mount {
push @opts, "ceph.id=$cmd_option->{userid}"; push @opts, "ceph.id=$cmd_option->{userid}";
push @opts, "ceph.keyfile=$secretfile" if defined($secretfile); push @opts, "ceph.keyfile=$secretfile" if defined($secretfile);
push @opts, "ceph.conf=$configfile" if defined($configfile); push @opts, "ceph.conf=$configfile" if defined($configfile);
push @opts, "ceph.client_fs=$fs_name" if defined($fs_name);
} else { } else {
push @opts, "name=$cmd_option->{userid}"; push @opts, "name=$cmd_option->{userid}";
push @opts, "secretfile=$secretfile" if defined($secretfile); push @opts, "secretfile=$secretfile" if defined($secretfile);
push @opts, "conf=$configfile" if defined($configfile); push @opts, "conf=$configfile" if defined($configfile);
push @opts, "fs=$fs_name" if defined($fs_name);
} }
push @opts, $scfg->{options} if $scfg->{options}; push @opts, $scfg->{options} if $scfg->{options};
@ -128,6 +131,10 @@ sub properties {
description => "Subdir to mount.", description => "Subdir to mount.",
type => 'string', format => 'pve-storage-path', type => 'string', format => 'pve-storage-path',
}, },
'fs-name' => {
description => "The Ceph filesystem name.",
type => 'string', format => 'pve-configid',
},
}; };
} }
@ -148,6 +155,7 @@ sub options {
maxfiles => { optional => 1 }, maxfiles => { optional => 1 },
keyring => { optional => 1 }, keyring => { optional => 1 },
'prune-backups' => { optional => 1 }, 'prune-backups' => { optional => 1 },
'fs-name' => { optional => 1 },
}; };
} }