Skip to content

Commit 0dcf774

Browse files
authored
FIX: Tofu attempts to apply security groups when port_security_enabled is false (#601)
* fix security_group_id logic * toggle secgroups without touching port security * document no_security_groups flag
1 parent 3219034 commit 0dcf774

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ resource "openstack_networking_port_v2" "control" {
1414
subnet_id = data.openstack_networking_subnet_v2.cluster_subnet[each.key].id
1515
}
1616

17-
port_security_enabled = lookup(each.value, "port_security_enabled", null)
18-
security_group_ids = lookup(each.value, "port_security_enabled", null) != false ? [for o in data.openstack_networking_secgroup_v2.nonlogin: o.id] : []
17+
no_security_groups = lookup(each.value, "no_security_groups", false)
18+
security_group_ids = lookup(each.value, "no_security_groups", false) ? [] : [for o in data.openstack_networking_secgroup_v2.nonlogin: o.id]
1919

2020
binding {
2121
vnic_type = lookup(var.vnic_types, each.key, "normal")

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ resource "openstack_networking_port_v2" "compute" {
4444
fixed_ip {
4545
subnet_id = data.openstack_networking_subnet_v2.subnet[each.value.network].id
4646
}
47-
48-
port_security_enabled = lookup(each.value, "port_security_enabled", null)
49-
security_group_ids = lookup(each.value, "port_security_enabled", null) != false ? var.security_group_ids : []
47+
48+
no_security_groups = lookup(each.value, "no_security_groups", false)
49+
security_group_ids = lookup(each.value, "no_security_groups", false) ? [] : var.security_group_ids
5050

5151
binding {
5252
vnic_type = lookup(var.vnic_types, each.value.network, "normal")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ variable "cluster_networks" {
1515
List of mappings defining networks. Mapping key/values:
1616
network: Required. Name of existing network
1717
subnet: Required. Name of existing subnet
18-
port_security_enabled: Optional. Bool, default null (for networks not owned by project)
18+
no_security_groups: Optional. Bool (default: false). Disable security groups
1919
EOT
2020
}
2121

0 commit comments

Comments
 (0)