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

RBD Plugin: add missing check for external ceph cluster

Browse Source 
In 7684225 ("ceph/rbd: set 'keyring' in ceph configuration for
externally managed RBD storages") the ceph config creation was packed
into a new function and checked whether the installation is an external
Ceph cluster or not.
However, a check was forgotten in the RBDPlugin which is now added.

Without this check a configuration in /etc/pve/priv/ceph/<pool>.conf is
created and pvestatd complains

 pvestatd[1144]: ignoring custom ceph config for storage 'pool', 'monhost' is not set (assuming pveceph managed cluster)! because the file /etc/pve/priv/ceph/pool.conf

Fixes: 7684225 ("ceph/rbd: set 'keyring' in ceph configuration for externally managed RBD storages")
Signed-off-by: Hannes Duerr <h.duerr@proxmox.com>
Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>
Link: https://lore.proxmox.com/20250716130117.71785-1-h.duerr@proxmox.com
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Hannes Duerr
2025-07-16 15:01:17 +02:00
committed by Thomas Lamprecht
parent 4fb733a9ac
commit 8099a4639f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/PVE/Storage/RBDPlugin.pm
View File

@ -457,8 +457,10 @@ sub options {
sub on_add_hook { sub on_add_hook {
my ($class, $storeid, $scfg, %param) = @_; my ($class, $storeid, $scfg, %param) = @_;
my $pveceph_managed = !defined($scfg->{monhost});
PVE::CephConfig::ceph_create_keyfile($scfg->{type}, $storeid, $param{keyring}); PVE::CephConfig::ceph_create_keyfile($scfg->{type}, $storeid, $param{keyring});
PVE::CephConfig::ceph_create_configuration($scfg->{type}, $storeid); PVE::CephConfig::ceph_create_configuration($scfg->{type}, $storeid) if !$pveceph_managed;
return; return;
} }