fix security_group_id logic

bertiethorpe · bertiethorpe · commit aa12167ecfea · 2025-03-05T10:18:39.000Z
diff --git a/environments/skeleton/{{cookiecutter.environment}}/tofu/control.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/control.tf
@@ -15,7 +15,7 @@ resource "openstack_networking_port_v2" "control" {
   }
 
   port_security_enabled = lookup(each.value, "port_security_enabled", null)
-  security_group_ids = lookup(each.value, "port_security_enabled", null) != false ? [for o in data.openstack_networking_secgroup_v2.nonlogin: o.id] : []
+  security_group_ids = lookup(each.value, "port_security_enabled", true) ? [for o in data.openstack_networking_secgroup_v2.nonlogin: o.id] : []
 
   binding {
     vnic_type = lookup(var.vnic_types, each.key, "normal")
diff --git a/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/nodes.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/nodes.tf
@@ -46,7 +46,7 @@ resource "openstack_networking_port_v2" "compute" {
   }
 
   port_security_enabled = lookup(each.value, "port_security_enabled", null)
-  security_group_ids = lookup(each.value, "port_security_enabled", null) != false ? var.security_group_ids : []
+  security_group_ids = lookup(each.value, "port_security_enabled", true) ? var.security_group_ids : []
 
   binding {
     vnic_type = lookup(var.vnic_types, each.value.network, "normal")

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ resource "openstack_networking_port_v2" "control" {`
`15`	`15`	`}`
`16`	`16`
`17`	`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] : []`
	`18`	`+ security_group_ids = lookup(each.value, "port_security_enabled", true) ? [for o in data.openstack_networking_secgroup_v2.nonlogin: o.id] : []`
`19`	`19`
`20`	`20`	`binding {`
`21`	`21`	`vnic_type = lookup(var.vnic_types, each.key, "normal")`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ resource "openstack_networking_port_v2" "compute" {`
`46`	`46`	`}`
`47`	`47`
`48`	`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 : []`
	`49`	`+ security_group_ids = lookup(each.value, "port_security_enabled", true) ? var.security_group_ids : []`
`50`	`50`
`51`	`51`	`binding {`
`52`	`52`	`vnic_type = lookup(var.vnic_types, each.value.network, "normal")`