Add bne as the second mail edge site and keep mel gated off
ci/woodpecker/pr/plan Pipeline was successful
ci/woodpecker/pr/pre-commit Pipeline was successful

This commit is contained in:
2026-10-16 22:58:47 +11:00
parent d0bc15f70b
commit cc571d1fb4
2 changed files with 14 additions and 9 deletions
+12 -7
View File
@@ -14,22 +14,25 @@ locals {
ospf_allspf = "224.0.0.5/32"
vpcs = {
bne = "172.18.32.0/24"
syd = "172.18.30.0/24"
mel = "172.18.31.0/24"
bne = "172.18.32.0/24"
}
vpns = {
aubne1nxvm2131 = { region = "bne", vpc_ip = "172.18.32.11", router_port = 51821, router_address = "198.18.2.176", wg_address = "198.18.2.177", loopback = "198.18.2.161" }
aumel1nxvm2133 = { region = "mel", vpc_ip = "172.18.31.11", router_port = 51822, router_address = "198.18.2.178", wg_address = "198.18.2.179", loopback = "198.18.2.162" }
ausyd2nxvm2131 = { region = "syd", vpc_ip = "172.18.30.11", router_port = 51821, router_address = "198.18.2.176", wg_address = "198.18.2.177", loopback = "198.18.2.161" }
aumel1nxvm2133 = { region = "mel", vpc_ip = "172.18.31.11", router_port = 51823, router_address = "198.18.2.180", wg_address = "198.18.2.181", loopback = "198.18.2.163" }
aubne1nxvm2133 = { region = "bne", vpc_ip = "172.18.32.11", router_port = 51822, router_address = "198.18.2.178", wg_address = "198.18.2.179", loopback = "198.18.2.162" }
}
edges = {
aubne1nxvm2130 = { region = "bne", vpc_ip = "172.18.32.10", vpn = "aubne1nxvm2131", ptr = "mta1.edge.unkin.net" }
ausyd2nxvm2130 = { region = "syd", vpc_ip = "172.18.30.10", vpn = "ausyd2nxvm2131", ptr = "mta1.edge.unkin.net" }
aumel1nxvm2132 = { region = "mel", vpc_ip = "172.18.31.10", vpn = "aumel1nxvm2133", ptr = "mta2.edge.unkin.net" }
aubne1nxvm2132 = { region = "bne", vpc_ip = "172.18.32.10", vpn = "aubne1nxvm2133", ptr = "mta2.edge.unkin.net" }
}
# regions whose servers are built; mel is out of stock at BinaryLane
enabled_regions = ["bne"]
enabled_regions = ["syd", "bne"]
enabled_vpns = { for k, v in local.vpns : k => v if contains(local.enabled_regions, v.region) }
enabled_edges = { for k, v in local.edges : k => v if contains(local.enabled_regions, v.region) }
}
@@ -119,7 +122,8 @@ resource "binarylane_server" "vpn" {
# user_data/image changes reinstall the server in place, wiping its disk
lifecycle {
ignore_changes = [user_data, image]
ignore_changes = [user_data, image]
prevent_destroy = true
}
}
@@ -151,7 +155,8 @@ resource "binarylane_server" "edge" {
# user_data/image changes reinstall the server in place, wiping its disk
lifecycle {
ignore_changes = [user_data, image]
ignore_changes = [user_data, image]
prevent_destroy = true
}
}