From 495b16d1e7ae749961da7993c74807a5c93641df Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Sun, 27 Aug 2023 16:45:54 +0000 Subject: [PATCH] zones: Env: allow multiple gateways on a Zone Signed-off-by: Alejandro Mery --- pkg/zones/env.go | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/pkg/zones/env.go b/pkg/zones/env.go index 32e30a4..a1051e0 100644 --- a/pkg/zones/env.go +++ b/pkg/zones/env.go @@ -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 -}