Ignore changes to port binding and dhcp options (#778)

* ignore port binding info; fixes tf when admin

* ignore port dhcp changes to fix networking-mlxn

* ignore port binding/dhcp options for caas

* fix TF linter errors

Author: sjpb

ansible/roles/cluster_infra/templates/resources.tf.j2

@@ -219,6 +219,14 @@ resource "openstack_networking_port_v2" "login" {
   binding {
     vnic_type = "{{ cluster_vnic_type | default('normal') }}"
   }
+
+  lifecycle {
+    ignore_changes = [
+      binding, # fixes running as admin
+      extra_dhcp_option # required for networking-mlnx neutron plugin
+    ]
+  }
+
 }
 
 # Storage network
@@ -235,6 +243,14 @@ resource "openstack_networking_port_v2" "login_storage" {
   binding {
     vnic_type = "{{ cluster_storage_vnic_type | default('normal') }}"
   }
+
+  lifecycle {
+    ignore_changes = [
+      binding, # fixes running as admin
+      extra_dhcp_option # required for networking-mlnx neutron plugin
+    ]
+  }
+
 }
 {% endif %}
 
@@ -258,8 +274,15 @@ resource "openstack_networking_port_v2" "control" {
 
   binding {
     vnic_type = "{{ cluster_vnic_type | default('normal') }}"
+  }
 
+  lifecycle {
+    ignore_changes = [
+      binding, # fixes running as admin
+      extra_dhcp_option # required for networking-mlnx neutron plugin
+    ]
   }
+
 }
 
 # Storage network
@@ -276,6 +299,14 @@ resource "openstack_networking_port_v2" "control_storage" {
   binding {
     vnic_type = "{{ cluster_storage_vnic_type | default('normal') }}"
   }
+
+  lifecycle {
+    ignore_changes = [
+      binding, # fixes running as admin
+      extra_dhcp_option # required for networking-mlnx neutron plugin
+    ]
+  }
+
 }
 {% endif %}
 
@@ -301,6 +332,14 @@ resource "openstack_networking_port_v2" "{{ nodegroup.name }}" {
   binding {
     vnic_type = "{{ cluster_vnic_type | default('normal') }}"
   }
+
+  lifecycle {
+    ignore_changes = [
+      binding, # fixes running as admin
+      extra_dhcp_option # required for networking-mlnx neutron plugin
+    ]
+  }
+
 }
 
 # Storage network
@@ -318,6 +357,14 @@ resource "openstack_networking_port_v2" "{{ nodegroup.name }}_storage" {
   binding {
     vnic_type = "{{ cluster_storage_vnic_type | default('normal') }}"
   }
+
+  lifecycle {
+    ignore_changes = [
+      binding, # fixes running as admin
+      extra_dhcp_option # required for networking-mlnx neutron plugin
+    ]
+  }
+
 }
 {% endif %}
 

environments/site/tofu/control.tf

@@ -34,6 +34,13 @@ resource "openstack_networking_port_v2" "control" {
   binding {
     vnic_type = lookup(var.vnic_types, each.key, "normal")
   }
+
+  lifecycle {
+    ignore_changes = [
+      binding,          # fixes running as admin
+      extra_dhcp_option # required for networking-mlnx neutron plugin
+    ]
+  }
 }
 
 resource "openstack_compute_instance_v2" "control" {

environments/site/tofu/node_group/nodes.tf

@@ -71,6 +71,13 @@ resource "openstack_networking_port_v2" "compute" {
   binding {
     vnic_type = lookup(var.vnic_types, each.value.net.network, "normal")
   }
+
+  lifecycle {
+    ignore_changes = [
+      binding,          # fixes running as admin
+      extra_dhcp_option # required for networking-mlnx neutron plugin
+    ]
+  }
 }
 
 resource "openstack_compute_instance_v2" "compute_fixed_image" {