Commit 3b998201 authored by Derek Nola's avatar Derek Nola
Browse files

Fix issue around using ip addresses in inventory, download and remove agent service properly 



Signed-off-by: default avatarDerek Nola <derek.nola@suse.com>
parent e01a8a2a

playbook/reset.yml

+7 −1
Original line number Diff line number Diff line
@@ -4,10 +4,16 @@ 
  gather_facts: true

  become: true

  tasks:

    - name: Run K3s Uninstall script

    - name: Run K3s Uninstall script [server]

      when: "'server' in group_names"

      ansible.builtin.command:

        cmd: k3s-uninstall.sh

        removes: /var/lib/rancher/k3s/*

    - name: Run K3s Uninstall script [agent]

      when: "'agent' in group_names"

      ansible.builtin.command:

        cmd: k3s-agent-uninstall.sh

        removes: /var/lib/rancher/k3s/*

    - name: Remove user kubeconfig

      ansible.builtin.file:

        path: /home/{{ ansible_user }}/.kube/config

roles/download/tasks/main.yml

+12 −1
Original line number Diff line number Diff line
@@ -8,10 +8,21 @@ 
    group: root

    mode: 0755



- name: Download k3s binary

- name: Download k3s binary [server]

  when: "'server' in group_names"

  ansible.builtin.command:

    cmd: /usr/local/bin/k3s-install.sh

  environment:

    INSTALL_K3S_SKIP_START: "true"

    INSTALL_K3S_VERSION: "{{ k3s_version }}"

  changed_when: true



- name: Download k3s binary [agent]

  when: "'agent' in group_names"

  ansible.builtin.command:

    cmd: /usr/local/bin/k3s-install.sh

  environment:

    INSTALL_K3S_SKIP_START: "true"

    INSTALL_K3S_VERSION: "{{ k3s_version }}"

    INSTALL_K3S_EXEC: "agent"

  changed_when: true

roles/k3s/server/tasks/main.yml

+2 −1
Original line number Diff line number Diff line 
---

- name: Init first server node

  when: ansible_hostname == groups['server'][0]

  # Handle both hostname OR ip address being supplied in inventory

  when: ansible_hostname == groups['server'][0] or groups['server'][0] in ansible_facts['all_ipv4_addresses']

  block:

    - name: Copy K3s service file [Single]

      when: groups['server'] | length == 1