network: change to vlanx-enabled dualstack

david-caro · david-caro · commit 9ffa401938c6 · 2025-07-08T15:07:48.000+02:00
Bug: T389942
Signed-off-by: David Caro &lt;dcaro@wikimedia.org&gt;
diff --git a/tofu/vars.tf b/tofu/vars.tf
@@ -66,15 +66,15 @@ variable "external_network_id" {
 variable "fixed_network" {
   type = map(any)
   default = {
-    "codfw1dev" = "lan-flat-cloudinstances2b"
-    "eqiad1"    = "lan-flat-cloudinstances2b"
+    "codfw1dev" = "VXLAN/IPv6-dualstack"
+    "eqiad1"    = "VXLAN/IPv6-dualstack"
   }
 }
 variable "fixed_subnet" {
   type = map(any)
   default = {
-    "codfw1dev" = "cloud-instances2-b-codfw"
-    "eqiad1"    = "cloud-instances2-b-eqiad"
+    "codfw1dev" = "vxlan-dualstack-ipv4"
+    "eqiad1"    = "vxlan-dualstack-ipv4"
   }
 }
 variable "workers" {

Original file line number	Diff line number	Diff line change
`@@ -66,15 +66,15 @@ variable "external_network_id" {`
`66`	`66`	`variable "fixed_network" {`
`67`	`67`	`type = map(any)`
`68`	`68`	`default = {`
`69`		`- "codfw1dev" = "lan-flat-cloudinstances2b"`
`70`		`- "eqiad1" = "lan-flat-cloudinstances2b"`
	`69`	`+ "codfw1dev" = "VXLAN/IPv6-dualstack"`
	`70`	`+ "eqiad1" = "VXLAN/IPv6-dualstack"`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`variable "fixed_subnet" {`
`74`	`74`	`type = map(any)`
`75`	`75`	`default = {`
`76`		`- "codfw1dev" = "cloud-instances2-b-codfw"`
`77`		`- "eqiad1" = "cloud-instances2-b-eqiad"`
	`76`	`+ "codfw1dev" = "vxlan-dualstack-ipv4"`
	`77`	`+ "eqiad1" = "vxlan-dualstack-ipv4"`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`	`variable "workers" {`