On June 26, 2025 4:40 pm, Fiona Ebner wrote:
> 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.
but in `path` we don't do this? shouldn't this be consistent?
also, we already have a full helper for getting a mon list from a ceph
config, so if we ever use that as source here, shouldn't we use that
helper?
>
> Co-developed-by: Alexandre Derumier <alexandre.derum...@groupe-cyllene.com>
> Signed-off-by: Fiona Ebner <f.eb...@proxmox.com>
> ---
>
> No changes in v3.
>
> src/PVE/Storage/RBDPlugin.pm | 39 ++++++++++++++++++++++++++++++++++++
> 1 file changed, 39 insertions(+)
>
> diff --git a/src/PVE/Storage/RBDPlugin.pm b/src/PVE/Storage/RBDPlugin.pm
> index 3f7ca9f..229b07d 100644
> --- a/src/PVE/Storage/RBDPlugin.pm
> +++ b/src/PVE/Storage/RBDPlugin.pm
> @@ -513,6 +513,45 @@ 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}"];
> + }
> +
> + $blockdev->{user} = "$cmd_option->{userid}" if $cmd_option->{keyring};
> +
> + return $blockdev;
> +}
> +
> sub find_free_diskname {
> my ($class, $storeid, $scfg, $vmid, $fmt, $add_fmt_suffix) = @_;
>
> --
> 2.47.2
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
