Now allows AZ to be specified for non-BM instances

Author: wtripp180901

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

@@ -25,6 +25,8 @@ locals {
       }
     )
   }
+
+  baremetal_az = var.availability_zone != null ? var.availability_zone : "nova"
 }
 
 resource "openstack_blockstorage_volume_v3" "compute" {
@@ -115,7 +117,7 @@ resource "openstack_compute_instance_v2" "compute_fixed_image" {
     fqdn: ${local.fqdns[each.key]}
   EOF
 
-  availability_zone = var.match_ironic_node ? "${var.availability_zone}::${var.baremetal_nodes[each.key]}" : null
+  availability_zone = var.match_ironic_node ? "${local.baremetal_az}::${var.baremetal_nodes[each.key]}" : var.availability_zone
 
   lifecycle {
     ignore_changes = [
@@ -170,7 +172,7 @@ resource "openstack_compute_instance_v2" "compute" {
     fqdn: ${local.fqdns[each.key]}
   EOF
 
-  availability_zone = var.match_ironic_node ? "${var.availability_zone}::${var.baremetal_nodes[each.key]}" : null
+  availability_zone = var.match_ironic_node ? "${local.baremetal_az}::${var.baremetal_nodes[each.key]}" : var.availability_zone
 
 }
 

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

@@ -150,9 +150,8 @@ variable "match_ironic_node" {
 
 variable "availability_zone" {
     type = string
-    description = "Name of availability zone - ignored unless match_ironic_node is true"
-    default = "nova"
-    nullable = false
+    description = "Name of availability zone. If undefined, defaults to 'nova' if match_ironic_node is true, defered to OpenStack otherwise"
+    default = null
 }
 
 variable "baremetal_nodes" {

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

@@ -79,7 +79,8 @@ variable "login" {
                           For any networks not specified here the cloud will
                           select addresses.
             match_ironic_node: Set true to launch instances on the Ironic node of the same name as each cluster node
-            availability_zone: Name of availability zone - ignored unless match_ironic_node is true (default: "nova")
+            availability_zone: Name of availability zone"Name of availability zone. If undefined, defaults to 'nova' 
+                               if match_ironic_node is true, defered to OpenStack otherwise"
             gateway_ip: Address to add default route via
             nodename_template: Overrides variable cluster_nodename_template
     EOF
@@ -122,7 +123,8 @@ variable "compute" {
                           For any networks not specified here the cloud will
                           select addresses.
             match_ironic_node: Set true to launch instances on the Ironic node of the same name as each cluster node
-            availability_zone: Name of availability zone - ignored unless match_ironic_node is true (default: "nova")
+            availability_zone: Name of availability zone. "Name of availability zone. If undefined, defaults to 'nova'
+                               if match_ironic_node is true, defered to OpenStack otherwise"
             gateway_ip: Address to add default route via
             nodename_template: Overrides variable cluster_nodename_template