Refactored so that agent or server is determined by metadata

Author: wtripp180901

ansible/bootstrap.yml

@@ -1,65 +1,9 @@
 ---
 
-- hosts: k3s
-  become: yes
-  tasks:
-    - name: Download k3s install script
-      ansible.builtin.get_url:
-        url: https://get.k3s.io/
-        timeout: 120
-        dest: /usr/local/bin/k3s-install.sh
-        owner: root
-        group: root
-        mode: "0755"
-
-- hosts: k3s_server
-  become: yes
-  tasks:
-    - name: Install k3s server
-      ansible.builtin.shell:
-        cmd: /usr/local/bin/k3s-install.sh
-      environment:
-        INSTALL_K3S_VERSION: "v1.31.0+k3s1"
-        INSTALL_K3S_EXEC: "server"
-        INSTALL_K3S_SKIP_START: "true"
-        INSTALL_K3S_SKIP_ENABLE: "true"
-      changed_when: true
-
-- hosts: k3s_agent
-  become: yes
-  tasks:
-    - name: Install k3s agent
-      ansible.builtin.shell:
-        cmd: /usr/local/bin/k3s-install.sh
-      environment:
-        INSTALL_K3S_VERSION: "v1.31.0+k3s1"
-        INSTALL_K3S_EXEC: "agent"
-        INSTALL_K3S_SKIP_START: "true"
-        INSTALL_K3S_SKIP_ENABLE: "true"
-      changed_when: true
-
-- hosts: k3s
-  become: yes
-  tasks:
-    - name: Creating directory on root path
-      ansible.builtin.file:
-        path: /root/bin
-        state: directory
-        owner: root
-    - name: Adding symlinks to k3s binaries for root
-      ansible.builtin.file:
-        src: /usr/local/bin/k3s
-        dest: "/root/bin/{{ item }}"
-        state: link
-        owner: root
-      with_items:
-        - k3s
-        - kubectl
-
-- hosts: k3s
+- hosts: cluster
   become: yes
   tasks:
-    - include_role:
+    - ansible.builtin.include_role:
         name: k3s
 
 - hosts: cluster

ansible/roles/k3s/files/start_k3s.yml

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

ansible/roles/k3s/files/start_k3s_agent.yml

@@ -1,18 +1,49 @@
 ---
 
-- name: Create ansible-init playbook install directory
+- name: Download k3s install script
+  ansible.builtin.get_url:
+    url: https://get.k3s.io/
+    timeout: 120
+    dest: /usr/local/bin/k3s-install.sh
+    owner: root
+    group: root
+    mode: "0755"
+
+- name: Install k3s server
+  ansible.builtin.shell:
+    cmd: /usr/local/bin/k3s-install.sh
+  environment:
+    INSTALL_K3S_VERSION: "v1.31.0+k3s1"
+    INSTALL_K3S_EXEC: "{{ item }}"
+    INSTALL_K3S_SKIP_START: "true"
+    INSTALL_K3S_SKIP_ENABLE: "true"
+  changed_when: true
+  with_items:
+    - server
+    - agent
+
+- name: Creating directory on root path
+  ansible.builtin.file:
+    path: /root/bin
+    state: directory
+    owner: root
+    
+- name: Adding symlinks to k3s binaries for root
+  ansible.builtin.file:
+    src: /usr/local/bin/k3s
+    dest: "/root/bin/{{ item }}"
+    state: link
+    owner: root
+  with_items:
+    - k3s
+    - kubectl
+  
+- name: Create ansible-init playbook install directory #TODO: move into ansible-init
   file: 
     path: "/etc/ansible-init/playbooks"
     state: directory
 
 - name: Install k3s server ansible-init playbook
   copy:
-    src: start_k3s_server.yml
-    dest: /etc/ansible-init/playbooks/0-start-k3s.yml
-  when: inventory_hostname in groups["k3s_server"]
-
-- name: Install k3s agent ansible-init playbook
-  copy:
-    src: start_k3s_agent.yml
+    src: start_k3s.yml
     dest: /etc/ansible-init/playbooks/0-start-k3s.yml
-  when: inventory_hostname in groups["k3s_agent"]

ansible/roles/k3s/files/start_k3s_server.yml

@@ -135,16 +135,3 @@ freeipa_client
 
 [ansible_init]
 # Hosts to run linux-anisble-init
-
-[k3s_server:children]
-# Host to run k3s server
-control
-
-[k3s_agent:children]
-# Hosts to run as k3s agents
-login
-compute
-
-[k3s:children]
-k3s_server
-k3s_agent

ansible/roles/k3s/tasks/main.yml

@@ -48,6 +48,7 @@ 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/common/inventory/groups

@@ -77,6 +77,8 @@ 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"
   }
 
   user_data = <<-EOF
@@ -127,6 +129,7 @@ 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