ignore port dhcp changes to fix networking-mlxn

sjpb · sjpb · commit ba4c3e920355 · 2025-09-16T08:01:10.000Z
diff --git a/environments/site/tofu/control.tf b/environments/site/tofu/control.tf
@@ -36,7 +36,10 @@ resource "openstack_networking_port_v2" "control" {
   }
 
   lifecycle {
-    ignore_changes = [ binding ]
+    ignore_changes = [
+      binding, # fixes running as admin
+      extra_dhcp_option # required for networking-mlnx neutron plugin
+    ]
   }
 }
 
diff --git a/environments/site/tofu/node_group/nodes.tf b/environments/site/tofu/node_group/nodes.tf
@@ -73,7 +73,10 @@ resource "openstack_networking_port_v2" "compute" {
   }
 
   lifecycle {
-    ignore_changes = [ binding ]
+    ignore_changes = [
+      binding, # fixes running as admin
+      extra_dhcp_option # required for networking-mlnx neutron plugin
+    ]
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,10 @@ resource "openstack_networking_port_v2" "control" {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`lifecycle {`
`39`		`- ignore_changes = [ binding ]`
	`39`	`+ ignore_changes = [`
	`40`	`+ binding, # fixes running as admin`
	`41`	`+ extra_dhcp_option # required for networking-mlnx neutron plugin`
	`42`	`+ ]`
`40`	`43`	`}`
`41`	`44`	`}`
`42`	`45`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,10 @@ resource "openstack_networking_port_v2" "compute" {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`lifecycle {`
`76`		`- ignore_changes = [ binding ]`
	`76`	`+ ignore_changes = [`
	`77`	`+ binding, # fixes running as admin`
	`78`	`+ extra_dhcp_option # required for networking-mlnx neutron plugin`
	`79`	`+ ]`
`77`	`80`	`}`
`78`	`81`	`}`
`79`	`82`