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>
zones: extend scan to ensure every zone has a ceph monitor
2023-09-05 11:25:22 +00:00 · 2023-09-05 11:25:22 +00:00 · 2023-09-05 11:25:22 +00:00 · 2023-09-05 11:25:22 +00:00 · 2023-09-05 11:25:11 +00:00 · 2023-09-04 20:29:48 +00:00
3 changed files with 0 additions and 27 deletions
@@ -1,8 +0,0 @@
-{
-    "cSpell.words": [
-        "ceph",
-        "darvaza",
-        "jpictl",
-        "zerolog"
-    ]
-}
@@ -4,21 +4,9 @@ import (
 	"bytes"
 	"sort"

-	"darvaza.org/core"
-	"github.com/gofrs/uuid/v5"
-
 	"git.jpi.io/amery/jpictl/pkg/ceph"
 )

-// GetCephFSID returns our Ceph's FSID
-func (m *Zones) GetCephFSID() (uuid.UUID, error) {
-	if core.IsZero(m.CephFSID) {
-		// TODO: generate one
-		return uuid.Nil, nil
-	}
-	return m.CephFSID, nil
-}
-
 // GetCephConfig reads the ceph.conf file
 func (m *Zones) GetCephConfig() (*ceph.Config, error) {
 	data, err := m.ReadFile("ceph.conf")
@@ -6,7 +6,6 @@ import (
 	"sort"

 	"darvaza.org/resolver"
-	"github.com/gofrs/uuid/v5"
 )

 var (
@@ -136,21 +135,15 @@ func (z *Zone) GatewayIDs() ([]int, int) {
 	return out, len(out)
 }

-// revive:disable:line-length-limit
-
 // Zones represents all zones in a cluster
 type Zones struct {
 	dir      fs.FS
 	resolver resolver.Resolver
 	domain   string

-	CephFSID uuid.UUID `toml:"ceph_fsid,omitempty" json:"ceph_fsid,omitempty" yaml:"ceph_fsid,omitempty"`
-
 	Zones []*Zone `toml:"zones"`
 }

-// revive:enable:line-length-limit
-
 // ForEachMachine calls a function for each Machine in the cluster
 // until instructed to terminate the loop
 func (m *Zones) ForEachMachine(fn func(*Machine) bool) {
Author	SHA1	Message	Date
amery	b0fcf963d6	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 11:25:22 +00:00
amery	54effed139	zones: extend scan to ensure every zone has a ceph monitor Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-05 11:25:22 +00:00
amery	89b32177b2	zones: set Machine.CephMonitor if its referenced as monitor on ceph.conf Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-05 11:25:22 +00:00
amery	a9399c8abf	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 11:25:22 +00:00
amery	8f36f98da9	zones: introduce Machine.CephMonitor field Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-05 11:25:11 +00:00
amery	e0e2def833	zones: introduce Zones.GetCephConfig() accessor for m/ceph.conf Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-04 20:29:48 +00:00
amery	bfcd9f26be	ceph: add NewConfigFromReader() and initial ceph.conf parser Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-09-04 20:29:23 +00:00