Browse Source

cluster: ensure ceph monitors are set when loading a config file

Signed-off-by: Alejandro Mery <amery@jpi.io>
pull/23/head
Alejandro Mery 1 year ago
parent
commit
6e7f24f491
  1. 6
      pkg/cluster/ceph_scan.go
  2. 1
      pkg/cluster/cluster_import.go

6
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()

1
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 {

Loading…
Cancel
Save