Use ansible collections for things

.gitignore

@@ -114,6 +114,7 @@ dmypy.json
 env/
 ansible/.vault_pass
 ansible/galaxy_roles
+ansible/galaxy_collections
 
 # Created by https://www.gitignore.io/api/terraform
 # Edit at https://www.gitignore.io/?templates=terraform

ansible/.ansible-lint

@@ -3,3 +3,7 @@ skip_list:
   - 401
   - 301
   - 503
+
+exclude_paths:
+  - ansible/galaxy_roles/
+  - ansible/galaxy_collections/

ansible/ansible.cfg

@@ -3,6 +3,7 @@ nocows = 1
 host_key_checking = False
 retry_files_enabled = False
 roles_path = $PWD/galaxy_roles:$PWD/roles
+collections_path = $PWD/galaxy_collections
 inventory = ./hosts
 become_ask_pass = True
 interpreter_python = auto

ansible/galaxy-requirements.yml

@@ -1,6 +1,11 @@
-- src: geerlingguy.docker
+collections:
-- src: geerlingguy.ntp
+  - ansible.posix
-- src: realorangeone.reflector
+  - community.general
-- src: https://github.com/IronicBadger/ansible-role-proxmox-nag-removal
+
+roles:
+  - src: geerlingguy.docker
+  - src: geerlingguy.ntp
+  - src: realorangeone.reflector
+  - src: https://github.com/IronicBadger/ansible-role-proxmox-nag-removal
     name: proxmox-nag-removal
-- src: chmduquesne.iptables_persistent
+  - src: chmduquesne.iptables_persistent

ansible/roles/base/tasks/ssh.yml

@@ -26,7 +26,7 @@
   register: sshd_config
 
 - name: Set up authorized keys
-  authorized_key:
+  ansible.posix.authorized_key:
     user: "{{ user }}"
     state: present
     key: "{{ lookup('file', item) }}"

ansible/yamllint.yml

@@ -2,6 +2,7 @@ extends: default
 
 ignore: |
   ansible/galaxy_roles
+  ansible/galaxy_collections
   ansible/group_vars/all/hosts.yml
   ansible/roles/traefik/files/traefik.yml
   ansible/roles/nebula/files/nebula.yml

scripts/ansible/deploy.sh

@@ -1,10 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -ex
-
-PATH=${PWD}/env/bin:${PATH}
-
-set -x
 
 cd ansible/
 

scripts/ansible/lint.sh

@@ -8,6 +8,6 @@ set -x
 
 yamllint -sc ansible/yamllint.yml ansible/
 
-ansible-lint ansible/main.yml -p -c ansible/.ansible-lint --exclude ansible/galaxy_roles/
+ansible-lint ansible/main.yml -p -c ansible/.ansible-lint
 
 cd ansible/ && ansible-playbook main.yml --syntax-check