Unverified Commit 1e633c5a authored by Derek Nola's avatar Derek Nola Committed by GitHub
Browse files

Rework Role Structure (#254) 



* Add more defaults
* Rename roles, covert download to airgap role
* Remove unnecessary gather_facts

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

playbook/reset.yml

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

- name: Undo cluster setup

  hosts: k3s_cluster

  gather_facts: true

  become: true

  tasks:

    - name: Run K3s Uninstall script [server]

playbook/site.yml

+3 −3
Original line number Diff line number Diff line
@@ -5,17 +5,17 @@ 
  become: true

  roles:

    - role: prereq

    - role: download

    - role: airgap

    - role: raspberrypi



- name: Setup K3S server

  hosts: server

  become: true

  roles:

    - role: k3s/server  # noqa: role-name[path]

    - role: k3s_server



- name: Setup K3S agent

  hosts: agent

  become: true

  roles:

    - role: k3s/agent  # noqa: role-name[path]
 
    - role: k3s_agent

playbook/upgrade.yml

+2 −4
Original line number Diff line number Diff line
@@ -4,15 +4,13 @@ 
# Agents have no such limitation

- name: Upgrade K3s Servers

  hosts: server

  gather_facts: true

  become: true

  serial: 1

  roles:

    - role: upgrade

    - role: k3s_upgrade



- name: Upgrade K3s Agents

  hosts: agent

  gather_facts: true

  become: true

  roles:

    - role: upgrade
 
    - role: k3s_upgrade

roles/download/tasks/main.yml→roles/airgap/tasks/main.yml

+0 −33
Original line number Diff line number Diff line
@@ -118,36 +118,3 @@ 
        INSTALL_K3S_SKIP_DOWNLOAD: "true"

        INSTALL_K3S_EXEC: "agent"

      changed_when: true
 


- name: Download k3s install script

  when: airgap_dir is undefined

  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: Download k3s binary [server]

  when:

    - "'server' in group_names"

    - airgap_dir is undefined

  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"

    - airgap_dir is undefined

  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