cope with not having permission to set availability zone

Author: sjpb

environments/skeleton/{{cookiecutter.environment}}/terraform/compute/nodes.tf

@@ -50,7 +50,7 @@ resource "openstack_compute_instance_v2" "compute" {
     k3s_server = var.k3s_server
   }
 
-  availability_zone = var.match_ironic_node ? "${var.availability_zone}::${var.baremetal_nodes[each.key]}" : var.availability_zone
+  availability_zone = var.match_ironic_node ? "${var.availability_zone}::${var.baremetal_nodes[each.key]}" : null
 
   user_data = <<-EOF
     #cloud-config

environments/skeleton/{{cookiecutter.environment}}/terraform/compute/variables.tf

@@ -85,7 +85,7 @@ variable "match_ironic_node" {
 }
 
 variable availability_zone {
-    description = "Name of availability zone. NB using ZONE:HOST or ZONE::NODE is not supported if setting match_ironic_node"
+    description = "Name of availability zone - ignored unless match_ironic_node is true"
     type = string
     default = "nova"
 }

environments/skeleton/{{cookiecutter.environment}}/terraform/nodes.tf

@@ -148,7 +148,7 @@ resource "openstack_compute_instance_v2" "login" {
     k3s_server = [for n in openstack_compute_instance_v2.control["control"].network: n.fixed_ip_v4 if n.access_network][0]
   }
 
-  availability_zone = each.value.match_ironic_node ? "${each.value.availability_zone}::${data.external.baremetal_nodes.result[each.key]}" : each.value.availability_zone
+  availability_zone = each.value.match_ironic_node ? "${each.value.availability_zone}::${data.external.baremetal_nodes.result[each.key]}" : null
 
   user_data = <<-EOF
     #cloud-config

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

@@ -36,8 +36,8 @@ variable "login_nodes" {
         Required:
             flavor: String flavor name
         Optional:
-            availability_zone: String, name of availability zone. NB using ZONE:HOST or ZONE::NODE is not supported if setting match_ironic_node
             match_ironic_node: Bool, whether to launch instances on the Ironic node of the same name as this cluster node
+            availability_zone: String, name of availability zone - ignored unless match_ironic_node is true
     EOF
 }