Merge pull request #758 from stackhpc/feat/login-custom-secgroups

wtripp180901 · web-flow · commit 66ca7feef24a · 2025-08-12T10:16:45.000+01:00
Allow specifying security groups for individual login groups
diff --git a/environments/site/tofu/login.tf b/environments/site/tofu/login.tf
@@ -40,7 +40,7 @@ module "login" {
   # not using openstack_compute_instance_v2.control.access_ip_v4 to avoid
   # updates to node metadata on deletion/recreation of the control node:
   control_address = openstack_networking_port_v2.control[var.cluster_networks[0].network].all_fixed_ips[0]
-  security_group_ids = [for o in data.openstack_networking_secgroup_v2.login: o.id]
+  security_group_ids = lookup(each.value, "security_group_ids", [for o in data.openstack_networking_secgroup_v2.login: o.id])
   baremetal_nodes = data.external.baremetal_nodes.result
 
   # input dict validation:
@@ -63,5 +63,6 @@ module "login" {
     "ip_addresses",
     "gateway_ip",
     "nodename_template",
+    "security_group_ids"
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ module "login" {`
`40`	`40`	`# not using openstack_compute_instance_v2.control.access_ip_v4 to avoid`
`41`	`41`	`# updates to node metadata on deletion/recreation of the control node:`
`42`	`42`	`control_address = openstack_networking_port_v2.control[var.cluster_networks[0].network].all_fixed_ips[0]`
`43`		`- security_group_ids = [for o in data.openstack_networking_secgroup_v2.login: o.id]`
	`43`	`+ security_group_ids = lookup(each.value, "security_group_ids", [for o in data.openstack_networking_secgroup_v2.login: o.id])`
`44`	`44`	`baremetal_nodes = data.external.baremetal_nodes.result`
`45`	`45`
`46`	`46`	`# input dict validation:`
`@@ -63,5 +63,6 @@ module "login" {`
`63`	`63`	`"ip_addresses",`
`64`	`64`	`"gateway_ip",`
`65`	`65`	`"nodename_template",`
	`66`	`+ "security_group_ids"`
`66`	`67`	`]`
`67`	`68`	`}`