Allow use of Ironic node name as instance name (site)

Author: priteau

environments/production/tofu/main.tf

@@ -47,6 +47,7 @@ module "cluster" {
         }
       ]
       match_ironic_node = true
+      use_ironic_node_name = true
       vnic_types = {
         netapp = "baremetal"
         infiniband = "baremetal"
@@ -72,6 +73,7 @@ module "cluster" {
         }
       ]
       match_ironic_node = true
+      use_ironic_node_name = true
       vnic_types = {
         netapp = "baremetal"
         infiniband = "baremetal"

environments/site/tofu/node_group/nodes.tf

@@ -61,7 +61,7 @@ resource "openstack_compute_instance_v2" "compute_fixed_image" {
 
   for_each = var.ignore_image_changes ? toset(var.nodes) : []
 
-  name = "${var.cluster_name}-${each.key}"
+  name = var.use_ironic_node_name ? "${each.key}" : "${var.cluster_name}-${each.key}"
   image_id = var.image_id
   flavor_name = var.flavor
   key_pair = var.key_pair
@@ -98,7 +98,7 @@ resource "openstack_compute_instance_v2" "compute_fixed_image" {
 
   user_data = <<-EOF
     #cloud-config
-    fqdn: ${var.cluster_name}-${each.key}.${var.cluster_name}.${var.cluster_domain_suffix}
+    fqdn: ${var.use_ironic_node_name ? "${each.key}" : "${var.cluster_name}-${each.key}"}.${var.cluster_name}.${var.cluster_domain_suffix}
   EOF
 
   availability_zone = var.match_ironic_node ? "${var.availability_zone}::${var.baremetal_nodes[each.key]}" : null
@@ -115,7 +115,7 @@ resource "openstack_compute_instance_v2" "compute" {
 
   for_each = var.ignore_image_changes ? [] : toset(var.nodes)
 
-  name = "${var.cluster_name}-${each.key}"
+  name = var.use_ironic_node_name ? "${each.key}" : "${var.cluster_name}-${each.key}"
   image_id = var.image_id
   flavor_name = var.flavor
   key_pair = var.key_pair
@@ -152,7 +152,7 @@ resource "openstack_compute_instance_v2" "compute" {
 
   user_data = <<-EOF
     #cloud-config
-    fqdn: ${var.cluster_name}-${each.key}.${var.cluster_name}.${var.cluster_domain_suffix}
+    fqdn: ${var.use_ironic_node_name ? "${each.key}" : "${var.cluster_name}-${each.key}"}.${var.cluster_name}.${var.cluster_domain_suffix}
   EOF
 
   availability_zone = var.match_ironic_node ? "${var.availability_zone}::${var.baremetal_nodes[each.key]}" : null

environments/site/tofu/node_group/variables.tf

@@ -112,6 +112,12 @@ variable "match_ironic_node" {
     default = false
 }
 
+variable "use_ironic_node_name" {
+    type = bool
+    description = "Whether to name instances and their FQDN the same as the matching Ironic node (no cluster name)"
+    default = false
+}
+
 variable "availability_zone" {
     type = string
     description = "Name of availability zone - ignored unless match_ironic_node is true"

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

@@ -27,6 +27,7 @@ module "compute" {
   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")
+  use_ironic_node_name = lookup(each.value, "use_ironic_node_name", false)
 
   # computed
   # not using openstack_compute_instance_v2.control.access_ip_v4 to avoid