Replace the syd hosts with bne and lift prevent_destroy for the swap

This commit is contained in:
2026-10-16 22:57:02 +11:00
parent c6d43af68b
commit d0bc15f70b
2 changed files with 8 additions and 10 deletions
+2 -2
View File
@@ -23,9 +23,9 @@ role in terraform-vault.
## Mail edge
Each DMZ VPC (`syd` 172.18.30.0/24, `mel` 172.18.31.0/24) holds a postfix edge host and a vpn host. The vpn
Each DMZ VPC (`bne` 172.18.32.0/24, `mel` 172.18.31.0/24) holds a postfix edge host and a vpn host. The vpn
host runs wg0 as a /31 point-to-point link to its own prodnxsr0020 interface
(`wg-syd` on 51821, `wg-mel` on 51822; `router_links` output) and forwards the
(`wg-bne` on 51821, `wg-mel` on 51822; `router_links` output) and forwards the
lab routes for its VPC; the edge host reaches the lab through it and has no
WireGuard. Link /31s and vpn loopbacks (dum0) come from 198.18.2.160/27. Lab
traffic is sourced from the /31 until Puppet brings up FRR, which peers OSPF
+6 -8
View File
@@ -14,22 +14,22 @@ locals {
ospf_allspf = "224.0.0.5/32"
vpcs = {
syd = "172.18.30.0/24"
bne = "172.18.32.0/24"
mel = "172.18.31.0/24"
}
vpns = {
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" }
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" }
}
edges = {
ausyd2nxvm2130 = { region = "syd", vpc_ip = "172.18.30.10", vpn = "ausyd2nxvm2131", ptr = "mta1.edge.unkin.net" }
aubne1nxvm2130 = { region = "bne", vpc_ip = "172.18.32.10", vpn = "aubne1nxvm2131", ptr = "mta1.edge.unkin.net" }
aumel1nxvm2132 = { region = "mel", vpc_ip = "172.18.31.10", vpn = "aumel1nxvm2133", ptr = "mta2.edge.unkin.net" }
}
# regions whose servers are built; mel is out of stock at BinaryLane
enabled_regions = ["syd"]
enabled_regions = ["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,8 +119,7 @@ resource "binarylane_server" "vpn" {
# user_data/image changes reinstall the server in place, wiping its disk
lifecycle {
ignore_changes = [user_data, image]
prevent_destroy = true
ignore_changes = [user_data, image]
}
}
@@ -152,8 +151,7 @@ resource "binarylane_server" "edge" {
# user_data/image changes reinstall the server in place, wiping its disk
lifecycle {
ignore_changes = [user_data, image]
prevent_destroy = true
ignore_changes = [user_data, image]
}
}