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.du...@proxmox.com>
Reviewed-by: Fiona Ebner <f.eb...@proxmox.com>
---
src/PVE/Storage/RBDPlugin.pm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/PVE/Storage/RBDPlugin.pm b/src/PVE/Storage/RBDPlugin.pm
index ce7db50..f8199a9 100644
--- a/src/PVE/Storage/RBDPlugin.pm
+++ b/src/PVE/Storage/RBDPlugin.pm
@@ -457,8 +457,10 @@ sub options {
sub on_add_hook {
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_configuration($scfg->{type}, $storeid);
+ PVE::CephConfig::ceph_create_configuration($scfg->{type}, $storeid) if
!$pveceph_managed;
return;
}
--
2.47.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
