From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id E8B371FF164
for <inbox@lore.proxmox.com>; Fri, 23 May 2025 15:33:03 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id C0D591BD1C;
Fri, 23 May 2025 15:32:35 +0200 (CEST)
From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri, 23 May 2025 15:31:53 +0200
Message-Id: <20250523133156.617227-8-f.ebner@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250523133156.617227-1-f.ebner@proxmox.com>
References: <20250523133156.617227-1-f.ebner@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.033 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
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] [RFC v2 storage 07/10] rbd plugin: implement new method
to get qemu blockdevice options
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
The mon host parsing is adapted from other places. While there
currently is no support for vector notation in the storage config
(it's a pve-storage-portal-dns-list option), it doesn't hurt to
anticipate it, should the list of mon hosts come from a ceph.conf
instead anytime in the future.
Co-developed-by: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com>
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
Changes in v2:
* Remove $snapname, is added in later patch as an option.
* Adapt to updated QEMU API.
src/PVE/Storage/RBDPlugin.pm | 42 ++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/src/PVE/Storage/RBDPlugin.pm b/src/PVE/Storage/RBDPlugin.pm
index 73bc97e..522d03c 100644
--- a/src/PVE/Storage/RBDPlugin.pm
+++ b/src/PVE/Storage/RBDPlugin.pm
@@ -493,6 +493,48 @@ sub path {
return ($path, $vmid, $vtype);
}
+sub qemu_blockdev_options {
+ my ($class, $scfg, $storeid, $volname) = @_;
+
+ my $cmd_option = PVE::CephConfig::ceph_connect_option($scfg, $storeid);
+ my ($name) = ($class->parse_volname($volname))[1];
+
+ if ($scfg->{krbd}) {
+ my $rbd_dev_path = get_rbd_dev_path($scfg, $storeid, $name);
+ return { driver => 'host_device', filename => $rbd_dev_path };
+ }
+
+ my $blockdev = {
+ driver => 'rbd',
+ pool => $scfg->{pool} ? "$scfg->{pool}" : 'rbd',
+ image => "$name",
+ };
+ $blockdev->{namespace} = "$scfg->{namespace}" if defined($scfg->{namespace});
+
+ $blockdev->{conf} = $cmd_option->{ceph_conf} if $cmd_option->{ceph_conf};
+
+ if (my $monhost = $scfg->{'monhost'}) {
+ my $server = [];
+ my @mons = PVE::Tools::split_list($monhost);
+ for my $mon (@mons) {
+ $mon =~ s/^\[?v\d\://; # remove beginning of vector
+ $mon =~ s|/\d+\]?||; # remove end of vector
+ my ($host, $port) = PVE::Tools::parse_host_and_port($mon);
+ $port = '3300' if !$port;
+ push @$server, { host => $host, port => $port };
+ }
+ $blockdev->{server} = $server;
+ $blockdev->{'auth-client-required'} = ["$cmd_option->{auth_supported}"];
+ }
+
+ if ($cmd_option->{keyring}) {
+ $blockdev->{user} = "$cmd_option->{userid}";
+ $blockdev->{'key-value-pairs'}->{keyring} = "$cmd_option->{keyring}";
+ }
+
+ return $blockdev;
+}
+
sub find_free_diskname {
my ($class, $storeid, $scfg, $vmid, $fmt, $add_fmt_suffix) = @_;
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel