diff --git a/.vscode/settings.json b/.vscode/settings.json index 2f6ce64..b4287d2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,9 +1,12 @@ { "cSpell.words": [ + "asciigoat", "ceph", + "cyclomatic", "darvaza", "gofrs", "jpictl", + "Wrapf", "zerolog" ] } 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 {