add support for additional_nodegroups

Author: sjpb

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

@@ -6,6 +6,7 @@ resource "local_file" "hosts" {
                             "control": openstack_compute_instance_v2.control
                             "login_groups": module.login
                             "compute_groups": module.compute
+                            "additional_groups": module.additional
                             "state_dir": var.state_dir
                             "cluster_home_volume": var.home_volume_provisioning != "none"
                           },

environments/skeleton/{{cookiecutter.environment}}/tofu/inventory.tpl

@@ -14,6 +14,7 @@ control:
     vars:
         appliances_state_dir: ${state_dir} # NB needs to be set on group not host otherwise it is ignored in packer build!
 
+# --- login nodes ---
 %{ for group_name in keys(login_groups) ~}
 ${cluster_name}_${group_name}:
     hosts:
@@ -32,6 +33,7 @@ login:
         ${cluster_name}_${group_name}:
 %{ endfor ~}
 
+# --- compute nodes ---
 %{ for group_name in keys(compute_groups) ~}
 ${cluster_name}_${group_name}:
     hosts:
@@ -44,10 +46,36 @@ ${cluster_name}_${group_name}:
     vars:
         # NB: this is the target image, not necessarily what is provisioned
         image_id: ${compute_groups[group_name]["image_id"]}
+
+${group_name}:
+    children:
+        ${cluster_name}_${group_name}:
+
 %{ endfor ~}
 
 compute:
     children:
 %{ for group_name in keys(compute_groups) ~}
         ${cluster_name}_${group_name}:
 %{ endfor ~}
+
+# --- additional nodes ---
+%{ for group_name in keys(additional_groups) ~}
+${cluster_name}_${group_name}:
+    hosts:
+%{ for node in additional_groups[group_name]["compute_instances"] ~}
+        ${ node.name }:
+            ansible_host: ${node.access_ip_v4}
+            instance_id: ${ node.id }
+            networks: ${jsonencode({for n in node.network: n.name => {"fixed_ip_v4": n.fixed_ip_v4, "fixed_ip_v6": n.fixed_ip_v6}})}
+%{ endfor ~}
+${group_name}:
+    children:
+        ${cluster_name}_${group_name}:
+
+%{ endfor ~}
+additional:
+    children:
+%{ for group_name in keys(additional_groups) ~}
+        ${cluster_name}_${group_name}:
+%{ endfor ~}

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

@@ -22,7 +22,7 @@ module "login" {
   gateway_ip = lookup(each.value, "gateway_ip", var.gateway_ip)
   nodename_template = lookup(each.value, "nodename_template", var.cluster_nodename_template)
 
-  # optionally set for group
+  # optionally set for group:
   networks = concat(var.cluster_networks, lookup(each.value, "extra_networks", []))
   # here null means "use module var default"
   extra_volumes = lookup(each.value, "extra_volumes", null)

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

@@ -125,11 +125,33 @@ variable "compute" {
             availability_zone: Name of availability zone - ignored unless match_ironic_node is true (default: "nova")
             gateway_ip: Address to add default route via
             nodename_template: Overrides variable cluster_nodename_template
+
+        Nodes are added to the following inventory groups:
+        - $group_name
+        - $cluster_name + '_' + $group_name - this is used for the stackhpc.openhpc role
+        - 'compute'
     EOF
 
     type = any # can't do any better; TF type constraints can't cope with heterogeneous inner mappings
 }
 
+variable "additional_nodegroups" {
+    default = {}
+    description = <<-EOF
+        Mapping defining homogenous groups of nodes for arbitrary purposes.
+        These nodes are not in the compute or login inventory groups so they
+        will not run slurmd.
+
+        Keys are names of groups.
+        Values are a mapping as for the "login" variable.
+
+        Nodes are added to the following inventory groups:
+        - $group_name
+        - $cluster_name + '_' + $group_name
+        - 'additional'
+    EOF
+}
+
 variable "environment_root" {
     type = string
     description = "Path to environment root, automatically set by activate script"