diff --git a/README.md b/README.md index ca65c74..cc64429 100644 --- a/README.md +++ b/README.md @@ -23,11 +23,12 @@ role in terraform-vault. ## Mail edge -Each DMZ VPC (`syd`, `mel`) holds a postfix edge host and a vpn host. The vpn +Each DMZ VPC (`syd` 198.18.30.0/24, `mel` 198.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 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 +WireGuard. The VPC /24 is connected on both hosts, so it wins over the lab +198.18.0.0/16 route via the vpn host. 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 over wg0 and advertises the loopback and VPC to the router. Router keys live at `kv/service/wireguard/binarylane/prodnxsr0020-`. wg0 is bootstrapped from a key in `user_data` (readable via the BinaryLane diff --git a/modules/binarylane/main.tf b/modules/binarylane/main.tf index 86b598b..6d665f4 100644 --- a/modules/binarylane/main.tf +++ b/modules/binarylane/main.tf @@ -14,18 +14,18 @@ locals { ospf_allspf = "224.0.0.5/32" vpcs = { - syd = "10.10.14.0/24" - mel = "10.10.15.0/24" + syd = "198.18.30.0/24" + mel = "198.18.31.0/24" } vpns = { - ausyd2nxvm2131 = { region = "syd", vpc_ip = "10.10.14.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 = "10.10.15.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 = "198.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 = "198.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 = "10.10.14.10", vpn = "ausyd2nxvm2131", ptr = "mta1.edge.unkin.net" } - aumel1nxvm2132 = { region = "mel", vpc_ip = "10.10.15.10", vpn = "aumel1nxvm2133", ptr = "mta2.edge.unkin.net" } + ausyd2nxvm2130 = { region = "syd", vpc_ip = "198.18.30.10", vpn = "ausyd2nxvm2131", ptr = "mta1.edge.unkin.net" } + aumel1nxvm2132 = { region = "mel", vpc_ip = "198.18.31.10", vpn = "aumel1nxvm2133", ptr = "mta2.edge.unkin.net" } } }