simplify control node definition and access IP

Author: sjpb

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

@@ -26,6 +26,6 @@ module "compute" {
 
   # computed
   k3s_token = local.k3s_token
-  control_address = [for n in openstack_compute_instance_v2.control["control"].network: n.fixed_ip_v4 if n.access_network][0]
+  control_address = openstack_compute_instance_v2.control.access_ip_v4
   security_group_ids = [for o in data.openstack_networking_secgroup_v2.nonlogin: o.id]
 }

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

@@ -24,9 +24,7 @@ resource "openstack_networking_port_v2" "control" {
 
 resource "openstack_compute_instance_v2" "control" {
 
-  for_each = toset(["control"])
-  
-  name = "${var.cluster_name}-${each.key}"
+  name = "${var.cluster_name}-control"
   image_id = var.cluster_image_id
   flavor_name = var.control_node_flavor
   key_pair = var.key_pair
@@ -62,11 +60,12 @@ resource "openstack_compute_instance_v2" "control" {
   metadata = {
     environment_root = var.environment_root
     k3s_token = local.k3s_token
+    # TODO: set k3s_subnet from access_network
   }
 
   user_data = <<-EOF
     #cloud-config
-    fqdn: ${var.cluster_name}-${each.key}.${var.cluster_name}.${var.cluster_domain_suffix}
+    fqdn: ${var.cluster_name}-control.${var.cluster_name}.${var.cluster_domain_suffix}
     
     bootcmd:
       %{for volume in local.control_volumes}

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

@@ -3,7 +3,7 @@ resource "local_file" "hosts" {
                           {
                             "cluster_name": var.cluster_name,
                             "cluster_domain_suffix": var.cluster_domain_suffix,
-                            "control_instances": openstack_compute_instance_v2.control
+                            "control": openstack_compute_instance_v2.control
                             "login_groups": module.login
                             "compute_groups": module.compute
                             "state_dir": var.state_dir

environments/skeleton/{{cookiecutter.environment}}/tofu/inventory.tpl

@@ -5,16 +5,13 @@ all:
 
 control:
     hosts:
-%{ for control in control_instances ~}
         ${ control.name }:
-            ansible_host: ${[for n in control.network: n.fixed_ip_v4 if n.access_network][0]}
-            instance_id: ${ control.id }
+            ansible_host: ${control.access_ip_v4}
+            instance_id: ${control.id}
             networks: ${jsonencode({for n in control.network: n.name => {"fixed_ip_v4": n.fixed_ip_v4, "fixed_ip_v6": n.fixed_ip_v6}})}
-%{ endfor ~}
     vars:
         appliances_state_dir: ${state_dir} # NB needs to be set on group not host otherwise it is ignored in packer build!
 
-
 %{ for group_name in keys(login_groups) ~}
 ${cluster_name}_${group_name}:
     hosts:

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

@@ -25,6 +25,6 @@ module "login" {
   key_pair = var.key_pair
   environment_root = var.environment_root
   k3s_token = local.k3s_token
-  control_address = [for n in openstack_compute_instance_v2.control["control"].network: n.fixed_ip_v4 if n.access_network][0]
+  control_address = openstack_compute_instance_v2.control.access_ip_v4
   security_group_ids = [for o in data.openstack_networking_secgroup_v2.login: o.id]
 }

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

@@ -138,6 +138,7 @@ resource "openstack_compute_instance_v2" "compute" {
         environment_root = var.environment_root
         k3s_token          = var.k3s_token
         control_address    = var.control_address
+        # TODO: set k3s_subnet from access_network
      },
     {for e in var.compute_init_enable: e => true}
   )