Skip to content

Commit 9f561fd

Browse files
committed
Remove support for setting VNIC binding profiles
This should not be required anymore and resolves an issue where, after creating a Neutron port of baremetal VNIC type, OpenTofu wants to revert its profile to an empty dict even though it was populated with local_link_information.
1 parent 30d6ce4 commit 9f561fd

File tree

6 files changed

+0
-21
lines changed

6 files changed

+0
-21
lines changed

environments/skeleton/{{cookiecutter.environment}}/tofu/compute.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ module "compute" {
1616
# can be set for group, defaults to top-level value:
1717
image_id = lookup(each.value, "image_id", var.cluster_image_id)
1818
vnic_types = lookup(each.value, "vnic_types", var.vnic_types)
19-
vnic_profiles = lookup(each.value, "vnic_profiles", var.vnic_profiles)
2019
volume_backed_instances = lookup(each.value, "volume_backed_instances", var.volume_backed_instances)
2120
root_volume_size = lookup(each.value, "root_volume_size", var.root_volume_size)
2221

environments/skeleton/{{cookiecutter.environment}}/tofu/control.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ resource "openstack_networking_port_v2" "control" {
1919

2020
binding {
2121
vnic_type = lookup(var.vnic_types, each.key, "normal")
22-
profile = lookup(var.vnic_profiles, each.key, "{}")
2322
}
2423
}
2524

environments/skeleton/{{cookiecutter.environment}}/tofu/login.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ module "login" {
1616
# can be set for group, defaults to top-level value:
1717
image_id = lookup(each.value, "image_id", var.cluster_image_id)
1818
vnic_types = lookup(each.value, "vnic_types", var.vnic_types)
19-
vnic_profiles = lookup(each.value, "vnic_profiles", var.vnic_profiles)
2019
volume_backed_instances = lookup(each.value, "volume_backed_instances", var.volume_backed_instances)
2120
root_volume_size = lookup(each.value, "root_volume_size", var.root_volume_size)
2221

environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/nodes.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ resource "openstack_networking_port_v2" "compute" {
5050

5151
binding {
5252
vnic_type = lookup(var.vnic_types, each.value.network, "normal")
53-
profile = lookup(var.vnic_profiles, each.value.network, "{}")
5453
}
5554
}
5655

environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/variables.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ variable "vnic_types" {
3737
default = {}
3838
}
3939

40-
variable "vnic_profiles" {
41-
type = map(string)
42-
default = {}
43-
}
44-
4540
variable "volume_backed_instances" {
4641
description = "Whether to use volumes for root disks"
4742
type = bool

environments/skeleton/{{cookiecutter.environment}}/tofu/variables.tf

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ variable "login" {
4646
image_id: Overrides variable cluster_image_id
4747
extra_networks: List of mappings in same format as cluster_networks
4848
vnic_type: Overrides variable vnic_type
49-
vnic_profile: Overrides variable vnic_profile
5049
volume_backed_instances: Overrides variable volume_backed_instances
5150
root_volume_size: Overrides variable root_volume_size
5251
extra_volumes: Mapping defining additional volumes to create and attach
@@ -86,7 +85,6 @@ variable "compute" {
8685
image_id: Overrides variable cluster_image_id
8786
extra_networks: List of mappings in same format as cluster_networks
8887
vnic_type: Overrides variable vnic_type
89-
vnic_profile: Overrides variable vnic_profile
9088
compute_init_enable: Toggles compute-init rebuild (see compute-init role docs)
9189
ignore_image_changes: Ignore changes to the image_id parameter (see docs/experimental/compute-init.md)
9290
volume_backed_instances: Overrides variable volume_backed_instances
@@ -145,16 +143,6 @@ variable "vnic_types" {
145143
default = {}
146144
}
147145

148-
variable "vnic_profiles" {
149-
type = map(string)
150-
description = <<-EOT
151-
Default VNIC binding profiles, keyed by network name. Values are json strings.
152-
See https://registry.terraform.io/providers/terraform-provider-openstack/openstack/latest/docs/resources/networking_port_v2#profile.
153-
If not given this defaults to "{}"
154-
EOT
155-
default = {}
156-
}
157-
158146
variable "login_security_groups" {
159147
type = list(string)
160148
description = "Name of preexisting security groups to apply to login nodes"

0 commit comments

Comments
 (0)