SYS-576 use ansible import_tasks in place of include; update python-builder images (#117)

Author: instantlinux

ansible/requirements.txt

@@ -1,3 +1,3 @@
-ansible==4.9.0
-ansible-lint==5.2.1
-pip==21.3.1
+ansible==8.2.0
+ansible-lint==6.17.2
+pip==23.2.1

ansible/roles/docker_node/tasks/main.yml

@@ -4,9 +4,9 @@
 # Set up all packages, volumes, security definitions and services
 #  for a docker swarm node
 
-- include: security.yml
-- include: repos.yml
-- include: kernel.yml
+- import_tasks: security.yml
+- import_tasks: repos.yml
+- include_tasks: kernel.yml
   when: kernel.non_stock
-- include: packages.yml
-- include: docker.yml
+- import_tasks: packages.yml
+- import_tasks: docker.yml

ansible/roles/docker_node/templates/docker.service.conf.j2

@@ -0,0 +1,6 @@
+[Unit]
+RequiresMountsFor={{ docker_volumewait }}
+
+[Service]
+ExecStart=
+ExecStart=/usr/bin/dockerd {{ docker.cli_opts }}

ansible/roles/fileserver/tasks/main.yml

@@ -14,8 +14,8 @@
     name: python-pip
   when: ansible_distribution_version < '20.04'
 
-- include: nfs.yml
-- include: instantlinux.yml
-- include: samba.yml
-- include: virtualbox.yml
-- include: vsftpd.yml
+- import_tasks: nfs.yml
+- import_tasks: instantlinux.yml
+- import_tasks: samba.yml
+- import_tasks: virtualbox.yml
+- import_tasks: vsftpd.yml

ansible/roles/kubernetes/tasks/main.yml

@@ -50,14 +50,14 @@
   command: hostnamectl --static set-hostname {{ inventory_hostname }}
   when: inventory_hostname != ansible_hostname
 
-- include: cri-dockerd.yml
+- include_tasks: cri-dockerd.yml
 
 - name: Set up master
-  include: master.yml
+  include_tasks: master.yml
   when: k8s.master
 
 - name: Join cluster
-  include: join.yml
+  include_tasks: join.yml
   when: not k8s.master
 
 # TODO bug 1294

ansible/roles/monitoring_agent/tasks/main.yml

@@ -1,7 +1,7 @@
 ---
 # main.yml
 
-- include: packages.yml
+- import_tasks: packages.yml
 
 - name: Local nagios plugins path
   file:

ansible/roles/mythfrontend/tasks/main.yml

@@ -8,19 +8,19 @@
     path: "{{ x11_config_path }}"
     state: directory
 
-- include: "{{ ansible_os_family | lower }}/packages.yml"
-- include: "{{ ansible_os_family | lower }}/lirc.yml"
+- include_tasks: "{{ ansible_os_family | lower }}/packages.yml"
+- include_tasks: "{{ ansible_os_family | lower }}/lirc.yml"
   when: ansible_distribution_version < '18.04'
-- include: "{{ ansible_os_family | lower }}/network.yml"
+- include_tasks: "{{ ansible_os_family | lower }}/network.yml"
   when: ansible_distribution_version < '18.04'
 
-- include: "{{ ansible_os_family | lower }}/ir-keytable.yml"
+- include_tasks: "{{ ansible_os_family | lower }}/ir-keytable.yml"
   when: ansible_distribution_version >= '18.04'
 
-- include: autosuspend.yml
+- include_tasks: autosuspend.yml
   when: suspend
 
-- include: drivers/{{ display_driver.type }}.yml
+- include_tasks: drivers/{{ display_driver.type }}.yml
 
-- include: setup.yml
-- include: "{{ ansible_os_family | lower }}/desktop.yml"
+- include_tasks: setup.yml
+- include_tasks: "{{ ansible_os_family | lower }}/desktop.yml"

ansible/roles/network/tasks/main.yml

@@ -3,11 +3,11 @@
   apt:
     name: "{{ ubuntu_packages }}"
 
-- include: network_legacy.yml
+- import_tasks: network_legacy.yml
   when: ansible_distribution_version < '18.04'
 
-- include: netplan.yml
+- import_tasks: netplan.yml
   when: ansible_distribution_version >= '18.04'
 
-- include: kernel.yml
-- include: sshd.yml
+- import_tasks: kernel.yml
+- import_tasks: sshd.yml

ansible/roles/users/tasks/main.yml

@@ -3,8 +3,8 @@
 
 # This is heavily customized: replace with your own security policies
 
-- include: packages.yml
-- include: grub.yml
+- import_tasks: packages.yml
+- import_tasks: grub.yml
 
 - name: Define group ids
   group:

ansible/roles/volumes/tasks/main.yml

@@ -32,8 +32,8 @@
   - Cryptsetup resize
   - Filesystem resize
 
-- include: encrypted.yml
-- include: cifs.yml
+- import_tasks: encrypted.yml
+- import_tasks: cifs.yml
 
 - name: Network and local fstab entries
   mount: