Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions ansible/roles/cluster_infra/templates/resources.tf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 %}

Expand All @@ -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
Expand All @@ -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 %}

Expand All @@ -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
Expand All @@ -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 %}

Expand Down
7 changes: 7 additions & 0 deletions environments/site/tofu/control.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
7 changes: 7 additions & 0 deletions environments/site/tofu/node_group/nodes.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
Loading