amery/jpictl
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

zones: change WriteEnv() to not fake gateways

Browse Source 
Signed-off-by: Alejandro Mery <amery@jpi.io>
This commit is contained in:
Alejandro Mery
2023-08-25 15:54:03 +00:00
parent 2207e4a4a4
commit 81aafbc083
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/zones/env.go
+9 -15
View File
@@ -32,11 +32,14 @@ func (m *Zones) writeEnvZone(w io.Writer, z *Zone) {
// ZONE{zoneID}_GW // ZONE{zoneID}_GW
gatewayID := getRingZeroGatewayID(z) gatewayID := getRingZeroGatewayID(z)
m.writeEnvVar(w, fmt.Sprintf("%v", gatewayID), "ZONE%v_%s", zoneID, "GW") if gatewayID > 0 {
m.writeEnvVar(w, fmt.Sprintf("%v", gatewayID), "ZONE%v_%s", zoneID, "GW")
// ZONE{zoneID}_IP // ZONE{zoneID}_IP
ip, _ := RingZeroAddress(zoneID, gatewayID) if ip, ok := RingZeroAddress(zoneID, gatewayID); ok {
m.writeEnvVar(w, ip.String(), "ZONE%v_%s", zoneID, "IP") m.writeEnvVar(w, ip.String(), "ZONE%v_%s", zoneID, "IP")
}
}
} }
func (m *Zones) writeEnvVarFn(w io.Writer, fn func(*Zones) string, name string, args ...any) { func (m *Zones) writeEnvVarFn(w io.Writer, fn func(*Zones) string, name string, args ...any) {
@@ -79,13 +82,9 @@ func genEnvZoneNodes(z *Zone) string {
} }
func getRingZeroGatewayID(z *Zone) int { func getRingZeroGatewayID(z *Zone) int {
var firstNodeID, gatewayID int var gatewayID int
z.ForEachMachine(func(p *Machine) bool { z.ForEachMachine(func(p *Machine) bool {
if firstNodeID == 0 {
firstNodeID = p.ID
}
if p.IsGateway() { if p.IsGateway() {
gatewayID = p.ID gatewayID = p.ID
} }
@@ -93,10 +92,5 @@ func getRingZeroGatewayID(z *Zone) int {
return gatewayID != 0 return gatewayID != 0
}) })
switch { return gatewayID
case gatewayID == 0:
return firstNodeID
default:
return gatewayID
}
} }