From 6e7f24f4912430671f5920752c273275e385cf51 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Tue, 12 Sep 2023 00:35:01 +0000 Subject: [PATCH] cluster: ensure ceph monitors are set when loading a config file Signed-off-by: Alejandro Mery --- pkg/cluster/ceph_scan.go | 6 +++++- pkg/cluster/cluster_import.go | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/cluster/ceph_scan.go b/pkg/cluster/ceph_scan.go index f85d09f..bd65821 100644 --- a/pkg/cluster/ceph_scan.go +++ b/pkg/cluster/ceph_scan.go @@ -71,7 +71,7 @@ func newCephScanTODO(cfg *ceph.Config) *cephScanTODO { return todo } -func (m *Cluster) scanCephMonitors(_ *ScanOptions) error { +func (m *Cluster) scanCephMonitors(opts *ScanOptions) error { cfg, err := m.GetCephConfig() switch { case os.IsNotExist(err): @@ -94,6 +94,10 @@ func (m *Cluster) scanCephMonitors(_ *ScanOptions) error { todo.LogMissing(m.log) } + return m.initCephMonitors(opts) +} + +func (m *Cluster) initCephMonitors(_ *ScanOptions) error { // make sure every zone has one m.ForEachZone(func(z *Zone) bool { _ = z.GetCephMonitors() diff --git a/pkg/cluster/cluster_import.go b/pkg/cluster/cluster_import.go index 697e476..0201324 100644 --- a/pkg/cluster/cluster_import.go +++ b/pkg/cluster/cluster_import.go @@ -14,6 +14,7 @@ func (m *Cluster) init(opts *ScanOptions) error { m.scanZoneIDs, m.scanSort, m.scanGateways, + m.initCephMonitors, m.initRegions, } { if err := fn(opts); err != nil {