use node module defaults for login vars

Author: sjpb

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

@@ -23,11 +23,12 @@ module "login" {
 
   # optionally set for group
   networks = concat(var.cluster_networks, lookup(each.value, "extra_networks", []))
-  extra_volumes = lookup(each.value, "extra_volumes", {})
-  fip_addresses = lookup(each.value, "fip_addresses", [])
-  fip_network = lookup(each.value, "fip_network", "")
-  match_ironic_node = lookup(each.value, "match_ironic_node", false)
-  availability_zone = lookup(each.value, "availability_zone", "nova")
+  # here null means "use module var default"
+  extra_volumes = lookup(each.value, "extra_volumes", null)
+  fip_addresses = lookup(each.value, "fip_addresses", null)
+  fip_network = lookup(each.value, "fip_network", null)
+  match_ironic_node = lookup(each.value, "match_ironic_node", null)
+  availability_zone = lookup(each.value, "availability_zone", null)
 
   # can't be set for login
   compute_init_enable = []
@@ -44,19 +45,19 @@ module "login" {
   group_name = each.key
   group_keys = keys(each.value)
   allowed_keys = [
-        "nodes",
-        "flavor",
-        "image_id",
-        "extra_networks",
-        "vnic_types",
-        "volume_backed_instances",
-        "root_volume_size",
-        "extra_volumes",
-        "fip_addresses",
-        "fip_network",
-        "match_ironic_node",
-        "availability_zone",
-        "gateway_ip",
-        "nodename_template",
+    "nodes",
+    "flavor",
+    "image_id",
+    "extra_networks",
+    "vnic_types",
+    "volume_backed_instances",
+    "root_volume_size",
+    "extra_volumes",
+    "fip_addresses",
+    "fip_network",
+    "match_ironic_node",
+    "availability_zone",
+    "gateway_ip",
+    "nodename_template",
   ]
 }

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

@@ -101,6 +101,7 @@ variable "fip_addresses" {
         allocated to the project.
     EOT
     default = []
+    nullable = false
 }
 
 variable "fip_network" {
@@ -110,6 +111,7 @@ variable "fip_network" {
         networks are defined.
     EOT
     default = ""
+    nullable = false
 }
 
 variable "match_ironic_node" {
@@ -149,7 +151,7 @@ variable "group_keys" {
     type = list
     validation {
       condition = length(setsubtract(var.group_keys, var.allowed_keys)) == 0
-      error_message = "Node group ${var.group_name} contains invalid key(s): ${
+      error_message = "Node group '${var.group_name}' contains invalid key(s): ${
         join(", ", setsubtract(var.group_keys, var.allowed_keys))}"
     }
 }