From 9f561fde9a081052bddec4d0cca76bc80e7ef070 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Mon, 24 Feb 2025 15:27:00 +0100 Subject: [PATCH] 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. --- .../{{cookiecutter.environment}}/tofu/compute.tf | 1 - .../{{cookiecutter.environment}}/tofu/control.tf | 1 - .../{{cookiecutter.environment}}/tofu/login.tf | 1 - .../tofu/node_group/nodes.tf | 1 - .../tofu/node_group/variables.tf | 5 ----- .../{{cookiecutter.environment}}/tofu/variables.tf | 12 ------------ 6 files changed, 21 deletions(-) diff --git a/environments/skeleton/{{cookiecutter.environment}}/tofu/compute.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/compute.tf index fe614a101..b3f455fe1 100644 --- a/environments/skeleton/{{cookiecutter.environment}}/tofu/compute.tf +++ b/environments/skeleton/{{cookiecutter.environment}}/tofu/compute.tf @@ -16,7 +16,6 @@ module "compute" { # can be set for group, defaults to top-level value: image_id = lookup(each.value, "image_id", var.cluster_image_id) vnic_types = lookup(each.value, "vnic_types", var.vnic_types) - vnic_profiles = lookup(each.value, "vnic_profiles", var.vnic_profiles) volume_backed_instances = lookup(each.value, "volume_backed_instances", var.volume_backed_instances) root_volume_size = lookup(each.value, "root_volume_size", var.root_volume_size) diff --git a/environments/skeleton/{{cookiecutter.environment}}/tofu/control.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/control.tf index a8a684d31..c4b402594 100644 --- a/environments/skeleton/{{cookiecutter.environment}}/tofu/control.tf +++ b/environments/skeleton/{{cookiecutter.environment}}/tofu/control.tf @@ -19,7 +19,6 @@ resource "openstack_networking_port_v2" "control" { binding { vnic_type = lookup(var.vnic_types, each.key, "normal") - profile = lookup(var.vnic_profiles, each.key, "{}") } } diff --git a/environments/skeleton/{{cookiecutter.environment}}/tofu/login.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/login.tf index d36c099b2..76efdac35 100644 --- a/environments/skeleton/{{cookiecutter.environment}}/tofu/login.tf +++ b/environments/skeleton/{{cookiecutter.environment}}/tofu/login.tf @@ -16,7 +16,6 @@ module "login" { # can be set for group, defaults to top-level value: image_id = lookup(each.value, "image_id", var.cluster_image_id) vnic_types = lookup(each.value, "vnic_types", var.vnic_types) - vnic_profiles = lookup(each.value, "vnic_profiles", var.vnic_profiles) volume_backed_instances = lookup(each.value, "volume_backed_instances", var.volume_backed_instances) root_volume_size = lookup(each.value, "root_volume_size", var.root_volume_size) diff --git a/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/nodes.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/nodes.tf index a6e850136..38908c9ea 100644 --- a/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/nodes.tf +++ b/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/nodes.tf @@ -50,7 +50,6 @@ resource "openstack_networking_port_v2" "compute" { binding { vnic_type = lookup(var.vnic_types, each.value.network, "normal") - profile = lookup(var.vnic_profiles, each.value.network, "{}") } } diff --git a/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/variables.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/variables.tf index 8a3f03876..513f51457 100644 --- a/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/variables.tf +++ b/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/variables.tf @@ -37,11 +37,6 @@ variable "vnic_types" { default = {} } -variable "vnic_profiles" { - type = map(string) - default = {} -} - variable "volume_backed_instances" { description = "Whether to use volumes for root disks" type = bool diff --git a/environments/skeleton/{{cookiecutter.environment}}/tofu/variables.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/variables.tf index 11b5b771d..2bfd36304 100644 --- a/environments/skeleton/{{cookiecutter.environment}}/tofu/variables.tf +++ b/environments/skeleton/{{cookiecutter.environment}}/tofu/variables.tf @@ -46,7 +46,6 @@ variable "login" { image_id: Overrides variable cluster_image_id extra_networks: List of mappings in same format as cluster_networks vnic_type: Overrides variable vnic_type - vnic_profile: Overrides variable vnic_profile volume_backed_instances: Overrides variable volume_backed_instances root_volume_size: Overrides variable root_volume_size extra_volumes: Mapping defining additional volumes to create and attach @@ -86,7 +85,6 @@ variable "compute" { image_id: Overrides variable cluster_image_id extra_networks: List of mappings in same format as cluster_networks vnic_type: Overrides variable vnic_type - vnic_profile: Overrides variable vnic_profile compute_init_enable: Toggles compute-init rebuild (see compute-init role docs) ignore_image_changes: Ignore changes to the image_id parameter (see docs/experimental/compute-init.md) volume_backed_instances: Overrides variable volume_backed_instances @@ -145,16 +143,6 @@ variable "vnic_types" { default = {} } -variable "vnic_profiles" { - type = map(string) - description = <<-EOT - Default VNIC binding profiles, keyed by network name. Values are json strings. - See https://registry.terraform.io/providers/terraform-provider-openstack/openstack/latest/docs/resources/networking_port_v2#profile. - If not given this defaults to "{}" - EOT - default = {} -} - variable "login_security_groups" { type = list(string) description = "Name of preexisting security groups to apply to login nodes"