agent/server config now based on if server name defined

Author: wtripp180901

ansible/roles/k3s/files/start_k3s.yml

@@ -4,8 +4,7 @@
     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_node_type: "{{ os_metadata.meta.k3s_node_type }}"
-    service_name: "{{ 'k3s-agent' if k3s_node_type == 'agent' else 'k3s' }}"
+    service_name: "{{ 'k3s' if k3s_server_name == 'none' else 'k3s-agent' }}"
   tasks:
     - name: Add the token for joining the cluster to the environment
       no_log: false # avoid logging the server token
@@ -17,12 +16,11 @@
       ansible.builtin.lineinfile:
         path: "/etc/systemd/system/{{ service_name }}.service.env"
         line: "K3S_URL=https://{{ k3s_server_name }}:6443"
-      when: k3s_node_type == "agent"
+      when: k3s_server_name != "none"
 
     - name: Start k3s service
       ansible.builtin.systemd:
         name: "{{ service_name }}"
         daemon_reload: true
         state: started
         enabled: true
-      when: k3s_node_type != "none"

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

@@ -48,7 +48,6 @@ resource "openstack_compute_instance_v2" "compute" {
     environment_root = var.environment_root
     k3s_token = var.k3s_token
     k3s_server = "${var.cluster_name}-control"
-    k3s_node_type = "agent"
   }
 
   user_data = <<-EOF

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

@@ -77,8 +77,7 @@ resource "openstack_compute_instance_v2" "control" {
   metadata = {
     environment_root = var.environment_root
     k3s_token = var.k3s_token
-    k3s_server = "${var.cluster_name}-control"
-    k3s_node_type = "server"
+    k3s_server = "none"
   }
 
   user_data = <<-EOF
@@ -129,7 +128,6 @@ resource "openstack_compute_instance_v2" "login" {
     environment_root = var.environment_root
     k3s_token = var.k3s_token
     k3s_server = "${var.cluster_name}-control"
-    k3s_node_type = "agent"
   }
 
   user_data = <<-EOF