change metadat from k3s_server to control_address

Author: sjpb

ansible/roles/cluster_infra/templates/resources.tf.j2

@@ -399,7 +399,7 @@ resource "openstack_compute_instance_v2" "login" {
         ansible_init_coll_{{ loop.index0 }}_source = "{{ collection.source }}"
       {% endif %}
     {% endfor %} 
-    k3s_server = openstack_compute_instance_v2.control.network[0].fixed_ip_v4
+    control_address = openstack_compute_instance_v2.control.network[0].fixed_ip_v4
     k3s_token = "{{ k3s_token }}"
   }
 }
@@ -565,7 +565,7 @@ resource "openstack_compute_instance_v2" "{{ partition.name }}" {
         ansible_init_coll_{{ loop.index0 }}_source = "{{ collection.source }}"
       {% endif %}
     {% endfor %} 
-    k3s_server = openstack_compute_instance_v2.control.network[0].fixed_ip_v4
+    control_address = openstack_compute_instance_v2.control.network[0].fixed_ip_v4
     k3s_token = "{{ k3s_token }}"
   }
 }

ansible/roles/compute_init/files/compute-init.yml

@@ -5,7 +5,7 @@
   become: yes
   vars:
     os_metadata: "{{ lookup('url', 'http://169.254.169.254/openstack/latest/meta_data.json') | from_json }}"
-    server_node_ip: "{{ os_metadata.meta.k3s_server }}"
+    server_node_ip: "{{ os_metadata.meta.control_address }}"
     enable_compute: "{{ os_metadata.meta.enable_compute | default(false) | bool }}"
     enable_resolv_conf: "{{ os_metadata.meta.enable_resolv_conf | default(false) | bool }}"
     enable_etc_hosts: "{{ os_metadata.meta.enable_etc_hosts | default(false) | bool }}"

ansible/roles/k3s/files/start_k3s.yml

@@ -3,7 +3,7 @@
   vars:
     os_metadata: "{{ lookup('url', 'http://169.254.169.254/openstack/latest/meta_data.json') | from_json }}"
     k3s_token: "{{ os_metadata.meta.k3s_token }}"
-    k3s_server_name: "{{ os_metadata.meta.k3s_server }}"
+    k3s_server_name: "{{ os_metadata.meta.control_address }}"
     service_name: "{{ 'k3s-agent' if k3s_server_name is defined else 'k3s' }}"
   tasks:
     - name: Ensure password directory exists

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

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

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

@@ -47,7 +47,7 @@ resource "openstack_compute_instance_v2" "compute" {
   metadata = {
     environment_root = var.environment_root
     k3s_token = var.k3s_token
-    k3s_server = var.k3s_server
+    control_address = var.control_address
   }
 
   user_data = <<-EOF

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

@@ -72,7 +72,7 @@ variable "k3s_token" {
     type = string
 }
 
-variable "k3s_server" {
-    description = "Name/address of k3s server"
+variable "control_address" {
+    description = "Name/address of control node"
     type = string
 }

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

@@ -126,7 +126,7 @@ resource "openstack_compute_instance_v2" "login" {
   metadata = {
     environment_root = var.environment_root
     k3s_token = var.k3s_token
-    k3s_server = [for n in openstack_compute_instance_v2.control["control"].network: n.fixed_ip_v4 if n.access_network][0]
+    control_address = [for n in openstack_compute_instance_v2.control["control"].network: n.fixed_ip_v4 if n.access_network][0]
   }
 
   user_data = <<-EOF