zones: Env: allow multiple gateways on a Zone

Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-08-27 16:45:54 +00:00
parent 42f77f3644
commit 495b16d1e7
1 changed files with 3 additions and 17 deletions
@@ -57,9 +57,9 @@ func (m *Env) writeEnvZone(w io.Writer, z *Zone) {
 	m.writeEnvVar(w, z.Name, "ZONE%v_%s", zoneID, "NAME")

 	// ZONE{zoneID}_GW
-	gatewayID := getRingZeroGatewayID(z)
-	if gatewayID > 0 {
-		m.writeEnvVar(w, fmt.Sprintf("%v", gatewayID), "ZONE%v_%s", zoneID, "GW")
+	gateways := z.GatewayIDs()
+	if len(gateways) > 0 {
+		m.writeEnvVar(w, genEnvInts(gateways), "ZONE%v_%s", zoneID, "GW")
 	}
 }

@@ -103,17 +103,3 @@ func genEnvZoneNodes(z *Zone) string {
 	}
 	return ""
 }
-
-func getRingZeroGatewayID(z *Zone) int {
-	var gatewayID int
-
-	z.ForEachMachine(func(p *Machine) bool {
-		if p.IsGateway() {
-			gatewayID = p.ID
-		}
-
-		return gatewayID != 0
-	})
-
-	return gatewayID
-}