jpictl: write m/ceph.conf on sync

Signed-off-by: Alejandro Mery <amery@jpi.io>
ceph: zones.Zones.WriteCephConfig() and ceph.Config.WriteTo()
2023-09-05 13:46:25 +00:00 · 2023-09-05 13:46:25 +00:00 · 2023-09-05 13:44:40 +00:00 · 2023-09-05 13:44:40 +00:00 · 2023-09-05 13:44:40 +00:00 · 2023-09-05 13:39:04 +00:00
2 changed files with 10 additions and 14 deletions
@@ -43,8 +43,6 @@ func loadGlobalConfField(cfg *GlobalConfig, field basic.Field) error {
 	// revive:enable:cyclomatic
 	// revive:enable:cognitive-complexity

-	// TODO: refactor when asciigoat's ini parser learns to do reflection
-
 	switch field.Key {
 	case "fsid":
 		if !core.IsZero(cfg.FSID) {
@@ -159,19 +159,17 @@ func (m *Zones) scanCephMonitors(_ *ScanOptions) error {
 		return err
 	}

-	if cfg != nil {
-		// store FSID
-		m.CephFSID = cfg.Global.FSID
+	// store FSID
+	m.CephFSID = cfg.Global.FSID

-		// flag monitors based on config
-		todo := newCephScanTODO(cfg)
-		m.ForEachMachine(func(p *Machine) bool {
-			p.CephMonitor = todo.checkMachine(p)
-			return false
-		})
-		if err := todo.Missing(); err != nil {
-			return core.Wrap(err, "ceph")
-		}
+	// flag monitors based on config
+	todo := newCephScanTODO(cfg)
+	m.ForEachMachine(func(p *Machine) bool {
+		p.CephMonitor = todo.checkMachine(p)
+		return false
+	})
+	if err := todo.Missing(); err != nil {
+		return core.Wrap(err, "ceph")
 	}

 	// make sure every zone has one
Author	SHA1	Message	Date
amery	4200db12cb	jpictl: write m/ceph.conf on sync Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-05 13:46:25 +00:00
amery	5e57fe5f30	ceph: zones.Zones.WriteCephConfig() and ceph.Config.WriteTo() Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-05 13:46:25 +00:00
amery	75dee617ef	env: set ceph monitors variables they indicate the ceph monitors on the specified zone * MON{zoneID}_NAME * MON{zoneID}_ID * MON{zoneID}_IP Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-05 13:44:40 +00:00
amery	cc7526ceb5	zones: extend scan to ensure every zone has a ceph monitor Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-05 13:44:40 +00:00
amery	d8657770d5	zones: store ceph FSID on scan Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-05 13:44:40 +00:00
amery	564a6c8af2	zones: set Machine.CephMonitor if its referenced as monitor on ceph.conf Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-05 13:39:04 +00:00
amery	c083a144ea	zones: introduce GenCephConfig() Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-05 13:39:04 +00:00
amery	226d529223	zones: introduce Zone.GetCephMonitors() returning the local ceph monitors and setting one if there is none. non-gateway nodes are preferred when setting a monitor automatically Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-05 13:39:04 +00:00
amery	7489b15c52	zones: introduce Zones.GetCephConfig() accessor for m/ceph.conf Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-05 13:39:04 +00:00
amery	d4757bebc2	ceph: add NewConfigFromReader() and initial ceph.conf parser Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-05 13:39:04 +00:00