zones: Env: allow multiple gateways on a Zone
Signed-off-by: Alejandro Mery <amery@jpi.io>
This commit is contained in:
+3
-17
@@ -57,9 +57,9 @@ func (m *Env) writeEnvZone(w io.Writer, z *Zone) {
|
|||||||
m.writeEnvVar(w, z.Name, "ZONE%v_%s", zoneID, "NAME")
|
m.writeEnvVar(w, z.Name, "ZONE%v_%s", zoneID, "NAME")
|
||||||
|
|
||||||
// ZONE{zoneID}_GW
|
// ZONE{zoneID}_GW
|
||||||
gatewayID := getRingZeroGatewayID(z)
|
gateways := z.GatewayIDs()
|
||||||
if gatewayID > 0 {
|
if len(gateways) > 0 {
|
||||||
m.writeEnvVar(w, fmt.Sprintf("%v", gatewayID), "ZONE%v_%s", zoneID, "GW")
|
m.writeEnvVar(w, genEnvInts(gateways), "ZONE%v_%s", zoneID, "GW")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -103,17 +103,3 @@ func genEnvZoneNodes(z *Zone) string {
|
|||||||
}
|
}
|
||||||
return ""
|
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
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user