failing - can't define standard and extra with different parameters!

Author: sjpb

environments/.stackhpc/tofu/main.tf

@@ -74,7 +74,7 @@ module "cluster" {
             flavor: var.other_node_flavor
         }
     }
-    compute = {
+    compute = tomap({
         standard: { # NB: can't call this default!
             nodes: ["compute-0", "compute-1"]
             flavor: var.other_node_flavor
@@ -87,7 +87,7 @@ module "cluster" {
             #nodes: ["extra-0", "extra-1"]
             flavor: var.other_node_flavor
         }
-    }
+    })
 
     volume_backed_instances = var.volume_backed_instances
 

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

@@ -14,20 +14,20 @@ module "compute" {
   environment_root = var.environment_root
 
   # can be set for group, defaults to top-level value:
-  image_id = lookup(each.value, "image_id", var.cluster_image_id)
-  vnic_types = lookup(each.value, "vnic_types", var.vnic_types)
-  volume_backed_instances = lookup(each.value, "volume_backed_instances", var.volume_backed_instances)
-  root_volume_size = lookup(each.value, "root_volume_size", var.root_volume_size)
-  gateway_ip = lookup(each.value, "gateway_ip", var.gateway_ip)
-  nodename_template = lookup(each.value, "nodename_template", var.cluster_nodename_template)
+  image_id = coalesce(each.value.image_id, var.cluster_image_id)
+  vnic_types = coalesce(each.value.vnic_types, var.vnic_types)
+  volume_backed_instances = coalesce(each.valuevolume_backed_instances, var.volume_backed_instances)
+  root_volume_size = coalesce(each.value.root_volume_size, var.root_volume_size)
+  gateway_ip = coalesce(each.value.gateway_ip, var.gateway_ip)
+  nodename_template = coalesce(each.value.nodename_template, var.cluster_nodename_template)
 
   # optionally set for group:
-  networks = concat(var.cluster_networks, lookup(each.value, "extra_networks", []))
-  extra_volumes = lookup(each.value, "extra_volumes", {})
-  compute_init_enable = lookup(each.value, "compute_init_enable", [])
-  ignore_image_changes = lookup(each.value, "ignore_image_changes", false)
-  match_ironic_node = lookup(each.value, "match_ironic_node", false)
-  availability_zone = lookup(each.value, "availability_zone", "nova")
+  networks = concat(var.cluster_networks, coalesce(each.value.extra_networks, []))
+  extra_volumes = coalesce(each.value.extra_volumes, {})
+  compute_init_enable = coalesce(each.value.compute_init_enable, [])
+  ignore_image_changes = coalesce(each.value.ignore_image_changes, false)
+  match_ironic_node = coalesce(each.value.match_ironic_node, false)
+  availability_zone = coalesce(each.value.availability_zone, "nova")
 
   # computed
   # not using openstack_compute_instance_v2.control.access_ip_v4 to avoid

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

@@ -57,7 +57,11 @@ variable "extra_volumes" {
             size: Size of volume in GB
         **NB**: The order in /dev is not guaranteed to match the mapping
         EOF
-    type = any
+    type = map(
+        object({
+            size = number
+        })
+    )
     default = {}
 }
 

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

@@ -71,15 +71,7 @@ variable "cluster_image_id" {
 }
 
 variable "compute" {
-    type = object(
-        object({
-            nodes = list(string)
-            flavor = string
-            image_id = optional(string)
-            extra_networks = list(map(string))
-            vnic_types = map(string)
-            compute_init_enable = list(string)
-            ignore_image_changes = bool
+
     description = <<-EOF
         Mapping defining homogenous groups of compute nodes. Groups are used
         in Slurm partition definitions.
@@ -109,6 +101,28 @@ variable "compute" {
             nodename_template: Overrides variable cluster_nodename_template
     EOF
     default = {}
+    type = map( # i.e. arbitrary keys, values are of given type ...
+        object({
+            # Only need to specify required/optional *keys* here to
+            # e.g. prevent missing/typos - value types are defined in
+            # module inputs so don't repeat here
+            nodes = any
+            flavor = any
+            
+            image_id = optional(any)
+            extra_networks = optional(any)
+            vnic_types = optional(any)
+            compute_init_enable = optional(any)
+            ignore_image_changes = optional(any)
+            volume_backed_instances = optional(any)
+            root_volume_size = optional(any)
+            extra_volumes = optional(any)
+            match_ironic_node = optional(any)
+            availability_zone = optional(any)
+            gateway_ip = optional(any)
+            nodename_template = optional(any)
+        })
+    )
 }
 
 variable "environment_root" {