From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 4027076752 for ; Tue, 19 Oct 2021 11:33:57 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0D1F52AF62 for ; Tue, 19 Oct 2021 11:33:57 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id D67A92AEF3 for ; Tue, 19 Oct 2021 11:33:54 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 778F4468DA for ; Tue, 19 Oct 2021 11:33:54 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 19 Oct 2021 11:33:42 +0200 Message-Id: <20211019093353.2451987-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211019093353.2451987-1-d.csapak@proxmox.com> References: <20211019093353.2451987-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.290 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH storage 1/1] cephfs: add support for multiple ceph filesystems X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Oct 2021 09:33:57 -0000 by optionally saving the name of the cephfs Signed-off-by: Dominik Csapak --- PVE/Storage/CephFSPlugin.pm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/PVE/Storage/CephFSPlugin.pm b/PVE/Storage/CephFSPlugin.pm index 3b9a791..f587db7 100644 --- a/PVE/Storage/CephFSPlugin.pm +++ b/PVE/Storage/CephFSPlugin.pm @@ -87,6 +87,7 @@ sub cephfs_mount { my $secretfile = $cmd_option->{keyring}; my $server = $cmd_option->{mon_host} // PVE::CephConfig::get_monaddr_list($configfile); my $type = 'ceph'; + my $fs_name = $scfg->{'fs-name'}; my @opts = (); if ($scfg->{fuse}) { @@ -94,10 +95,12 @@ sub cephfs_mount { push @opts, "ceph.id=$cmd_option->{userid}"; push @opts, "ceph.keyfile=$secretfile" if defined($secretfile); push @opts, "ceph.conf=$configfile" if defined($configfile); + push @opts, "ceph.client_fs=$fs_name" if defined($fs_name); } else { push @opts, "name=$cmd_option->{userid}"; push @opts, "secretfile=$secretfile" if defined($secretfile); push @opts, "conf=$configfile" if defined($configfile); + push @opts, "fs=$fs_name" if defined($fs_name); } push @opts, $scfg->{options} if $scfg->{options}; @@ -128,6 +131,10 @@ sub properties { description => "Subdir to mount.", 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 }, keyring => { optional => 1 }, 'prune-backups' => { optional => 1 }, + 'fs-name' => { optional => 1 }, }; } -- 2.30.2