Unverified Commit 4d6e6028 authored by Jon S. Stumpf's avatar Jon S. Stumpf Committed by GitHub
Browse files

Role tweaks (#268) 



* Limited boolean values to true/false;

Signed-off-by: default avatarJon S. Stumpf <jon.stumpf@gmail.com>

* Moved ArchLinux prereq task to be a handler;

Signed-off-by: default avatarJon S. Stumpf <jon.stumpf@gmail.com>

* Standardized task name for adding cgroup support;

Signed-off-by: default avatarJon S. Stumpf <jon.stumpf@gmail.com>

* Have backrefs: follow path:;

Signed-off-by: default avatarJon S. Stumpf <jon.stumpf@gmail.com>

* Addressed ansible-lint errors;

Signed-off-by: default avatarJon S. Stumpf <jon.stumpf@gmail.com>

* Fixed #264, task 7: Copy K3s service file;

Signed-off-by: default avatarJon S. Stumpf <jon.stumpf@gmail.com>

---------

Signed-off-by: default avatarJon S. Stumpf <jon.stumpf@gmail.com>
parent b4237ef2

.yamllint

+1 −1
Original line number Diff line number Diff line
@@ -6,4 +6,4 @@ rules: 
    max: 120

    level: warning

  truthy:

    allowed-values: ['true', 'false', 'yes', 'no']
 
    allowed-values: ['true', 'false']

roles/k3s_agent/tasks/main.yml

+4 −3
Original line number Diff line number Diff line
@@ -21,16 +21,17 @@ 
  changed_when: true



- name: Copy K3s service file

  register: k3s_agent_service

  ansible.builtin.template:

    src: "k3s-agent.service.j2"

    dest: "{{ systemd_dir }}/k3s-agent.service"

    owner: root

    group: root

    mode: 0755

    mode: "u=rw,g=r,o=r"



- name: Enable and check K3s service

  ansible.builtin.systemd:

    name: k3s-agent

    daemon_reload: true

    state: started

    daemon_reload: "{{ true if k3s_agent_service.changed else false }}"

    state: "{{ 'restarted' if k3s_agent_service.changed else 'started' }}"

    enabled: true

roles/prereq/tasks/main.yml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
  when: ansible_distribution in ['Ubuntu']

  ansible.builtin.apt:

    name: policycoreutils  # Used by install script to restore SELinux context

    update_cache: yes

    update_cache: true



- name: Enable IPv4 forwarding

  ansible.posix.sysctl:

roles/raspberrypi/handlers/main.yml

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

- name: Reboot Pi

  ansible.builtin.reboot:

    post_reboot_delay: 10

    reboot_timeout: 60



- name: Regenerate bootloader image

  ansible.builtin.command: ./mkscr

  args:

    chdir: /boot

  notify: Reboot Pi

  changed_when: true

roles/raspberrypi/tasks/prereq/Archlinux.yml

+4 −10
Original line number Diff line number Diff line 
---

- name: Enable cgroup via boot commandline if not already enabled for Archlinux

- name: Enable cgroup via boot commandline if not already enabled

  ansible.builtin.lineinfile:

    path: /boot/boot.txt

    # yamllint disable-line rule:line-length

    search_string: setenv bootargs console=ttyS1,115200 console=tty0 root=PARTUUID=${uuid} rw rootwait smsc95xx.macaddr="${usbethaddr}"

    # yamllint disable-line rule:line-length

    line: setenv bootargs console=ttyS1,115200 console=tty0 root=PARTUUID=${uuid} rw rootwait smsc95xx.macaddr="${usbethaddr}" cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory

  register: kernel_cmdline_cgroup



- name: Create

  ansible.builtin.command: ./mkscr

  args:

    chdir: /boot

  notify: Reboot Pi

  changed_when: false

  when: kernel_cmdline_cgroup.changed  # noqa: no-handler
 
  notify: Regenerate bootloader image