Skip to content

Remove support for setting VNIC binding profiles #586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 4, 2025
Merged

Remove support for setting VNIC binding profiles #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f561fd
Remove support for setting VNIC binding profiles
priteau Feb 24, 2025
93a0e3c
Merge branch 'main' into binding-profile
sjpb Mar 4, 2025
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
1 change: 0 additions & 1 deletion environments/skeleton/{{cookiecutter.environment}}/tofu/compute.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
1 change: 0 additions & 1 deletion environments/skeleton/{{cookiecutter.environment}}/tofu/control.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, "{}")
}
}

Expand Down
1 change: 0 additions & 1 deletion environments/skeleton/{{cookiecutter.environment}}/tofu/login.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
1 change: 0 additions & 1 deletion environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/nodes.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, "{}")
}
}

Expand Down
5 changes: 0 additions & 5 deletions environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions environments/skeleton/{{cookiecutter.environment}}/tofu/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down