From 9d918c9da0aa8383e8e94c1274164ae3ae528e19 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Fri, 10 Nov 2023 10:21:22 -0800 Subject: [PATCH] Handle apparmor for Debian 11 when parser not present Signed-off-by: Derek Nola --- roles/k3s/server/tasks/main.yml | 10 +++++++++- roles/prereq/tasks/main.yml | 11 ++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/roles/k3s/server/tasks/main.yml b/roles/k3s/server/tasks/main.yml index caf7c6d..076817d 100644 --- a/roles/k3s/server/tasks/main.yml +++ b/roles/k3s/server/tasks/main.yml @@ -41,7 +41,7 @@ owner: "{{ ansible_user }}" mode: "u=rwx,g=rx,o=" - - name: Pause to allow server startup + - name: Pause to allow first server startup when: (groups['server'] | length) > 1 ansible.builtin.pause: seconds: 10 @@ -54,6 +54,14 @@ owner: "{{ ansible_user }}" mode: "u=rw,g=,o=" + - name: Add K3s autocomplete to user bashrc + become: true + become_user: "{{ ansible_user }}" + ansible.builtin.command: + cmd: "k3s completion bash -i" + register: out + changed_when: out.rc != 0 + - name: Change server to API endpoint instead of localhost ansible.builtin.command: >- /usr/local/bin/k3s kubectl config set-cluster default diff --git a/roles/prereq/tasks/main.yml b/roles/prereq/tasks/main.yml index e5cb7dd..a8b261c 100644 --- a/roles/prereq/tasks/main.yml +++ b/roles/prereq/tasks/main.yml @@ -129,7 +129,7 @@ register: apparmor_status changed_when: false -- name: Install Apparmor Parser +- name: Install Apparmor Parser [Suse] when: - apparmor_status.stdout == "Y" - ansible_os_family == 'Suse' @@ -137,6 +137,15 @@ name: apparmor-parser state: present +- name: Install Apparmor Parser [Debian] + when: + - apparmor_status.stdout == "Y" + - ansible_distribution == 'Debian' + - ansible_facts['distribution_major_version'] == "11" + ansible.builtin.package: + name: apparmor + state: present + - name: Add /usr/local/bin to sudo secure_path ansible.builtin.lineinfile: line: 'Defaults secure_path = /sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin'