Skip to content

Commit 71b910d

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 6a349c3 commit 71b910d

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
@@ -18,7 +18,6 @@ resource "openstack_networking_port_v2" "control" {
1818

1919
binding {
2020
vnic_type = lookup(var.vnic_types, each.key, "normal")
21-
profile = lookup(var.vnic_profiles, each.key, "{}")
2221
}
2322
}
2423

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
@@ -49,7 +49,6 @@ resource "openstack_networking_port_v2" "compute" {
4949

5050
binding {
5151
vnic_type = lookup(var.vnic_types, each.value.network, "normal")
52-
profile = lookup(var.vnic_profiles, each.value.network, "{}")
5352
}
5453
}
5554

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
@@ -45,7 +45,6 @@ variable "login" {
4545
image_id: Overrides variable cluster_image_id
4646
extra_networks: List of mappings in same format as cluster_networks
4747
vnic_type: Overrides variable vnic_type
48-
vnic_profile: Overrides variable vnic_profile
4948
volume_backed_instances: Overrides variable volume_backed_instances
5049
root_volume_size: Overrides variable root_volume_size
5150
extra_volumes: Mapping defining additional volumes to create and attach
@@ -85,7 +84,6 @@ variable "compute" {
8584
image_id: Overrides variable cluster_image_id
8685
extra_networks: List of mappings in same format as cluster_networks
8786
vnic_type: Overrides variable vnic_type
88-
vnic_profile: Overrides variable vnic_profile
8987
compute_init_enable: Toggles compute-init rebuild (see compute-init role docs)
9088
ignore_image_changes: Ignore changes to the image_id parameter (see docs/experimental/compute-init.md)
9189
volume_backed_instances: Overrides variable volume_backed_instances
@@ -144,16 +142,6 @@ variable "vnic_types" {
144142
default = {}
145143
}
146144

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

0 commit comments

Comments
 (0)