diff --git a/environments/skeleton/{{cookiecutter.environment}}/tofu/control.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/control.tf index 26597b1ac..ebf13e372 100644 --- a/environments/skeleton/{{cookiecutter.environment}}/tofu/control.tf +++ b/environments/skeleton/{{cookiecutter.environment}}/tofu/control.tf @@ -14,8 +14,8 @@ resource "openstack_networking_port_v2" "control" { subnet_id = data.openstack_networking_subnet_v2.cluster_subnet[each.key].id } - port_security_enabled = lookup(each.value, "port_security_enabled", true) - security_group_ids = lookup(each.value, "port_security_enabled", true) ? [for o in data.openstack_networking_secgroup_v2.nonlogin: o.id] : [] + 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] : [] 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 index 186b8538b..25f0cedc8 100644 --- a/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/nodes.tf +++ b/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/nodes.tf @@ -45,8 +45,8 @@ resource "openstack_networking_port_v2" "compute" { subnet_id = data.openstack_networking_subnet_v2.subnet[each.value.network].id } - port_security_enabled = lookup(each.value, "port_security_enabled", true) - security_group_ids = lookup(each.value, "port_security_enabled", true) ? var.security_group_ids : [] + 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 : [] binding { vnic_type = lookup(var.vnic_types, each.value.network, "normal") diff --git a/environments/skeleton/{{cookiecutter.environment}}/tofu/variables.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/variables.tf index 8d5808ba7..2b08dbd25 100644 --- a/environments/skeleton/{{cookiecutter.environment}}/tofu/variables.tf +++ b/environments/skeleton/{{cookiecutter.environment}}/tofu/variables.tf @@ -15,7 +15,7 @@ variable "cluster_networks" { List of mappings defining networks. Mapping key/values: network: Required. Name of existing network subnet: Required. Name of existing subnet - port_security_enabled: Optional. Bool, default true + port_security_enabled: Optional. Bool, default null (for networks not owned by project) EOT }