Factorize tasks | refs #39283

roles/nudgis/apt_cacher/tasks/base.yml

 ---
 
-- ansible.builtin.import_tasks: ../../shared/tasks/firewall_rules_files.yml
+- ansible.builtin.import_role:
+    name: "nudgis/shared"
+    tasks_from: "firewall_rules_files.yml"
+  vars:
+    firewall_rules_files: "{{ apt_cacher_firewall_rules_files }}"
 
 ...

roles/nudgis/apt_cacher/tasks/install.yml

 ---
 
 - name: "Apt cacher install"
-  ansible.builtin.apt:
-    force_apt_get: true
-    install_recommends: false
-    name: "{{ apt_cacher_packages }}"
-  register: apt_status
-  retries: 60
-  until: apt_status is success or ('Failed to lock apt for exclusive operation' not in apt_status.msg and '/var/lib/dpkg/lock' not in apt_status.msg)
+  ansible.builtin.import_role:
+    name: "nudgis/shared"
+    tasks_from: "apt_install.yml"
+  vars:
+    apt_packages: "{{ apt_cacher_packages }}"
 
 ...

roles/nudgis/apt_cacher/vars/main.yml

@@ -5,7 +5,7 @@ apt_cacher_packages:
   - apt-cacher-ng
 
 # Group firewall rules filename, see roles/shared/files/nftables/
-firewall_rules_files:
+apt_cacher_firewall_rules_files:
   - apt-cacher
 
 ...

roles/nudgis/cache/tasks/base.yml

@@ -14,7 +14,11 @@
     dest: /etc/munin/plugin-conf.d/nginx_ubicast_multi
     mode: "644"
 
-- ansible.builtin.import_tasks: ../../shared/tasks/firewall_rules_files.yml
+- ansible.builtin.import_role:
+    name: "nudgis/shared"
+    tasks_from: "firewall_rules_files.yml"
+  vars:
+    firewall_rules_files: "{{ cache_firewall_rules_files }}"
 
 - name: "Flush handlers"
   ansible.builtin.meta: flush_handlers

roles/nudgis/cache/tasks/install.yml

 ---
 
 - name: "MediaCache packages installation"
-  ansible.builtin.apt:
-    force_apt_get: true
-    install_recommends: false
-    name: "{{ cache_packages }}"
-    state: present
-  register: apt_status
-  retries: 60
-  until: apt_status is success or ('Failed to lock apt for exclusive operation' not in apt_status.msg and '/var/lib/dpkg/lock' not in apt_status.msg)
+  ansible.builtin.import_role:
+    name: "nudgis/shared"
+    tasks_from: "apt_install.yml"
+  vars:
+    apt_packages: "{{ cache_packages }}"
 
 ...

roles/nudgis/cache/vars/main.yml

@@ -5,7 +5,7 @@ cache_packages:
   - ubicast-mediacache
 
 # Group firewall rules filename, see roles/shared/files/nftables/
-firewall_rules_files:
+cache_firewall_rules_files:
   - http
 
 ...

roles/nudgis/front/tasks/base.yml

@@ -19,7 +19,11 @@
     mode: "preserve"
     remote_src: true
 
-- ansible.builtin.import_tasks: ../../shared/tasks/firewall_rules_files.yml
+- ansible.builtin.import_role:
+    name: "nudgis/shared"
+    tasks_from: "firewall_rules_files.yml"
+  vars:
+    firewall_rules_files: "{{ nudgis_firewall_rules_files }}"
 
 - name: "Flush handlers"
   ansible.builtin.meta: flush_handlers

roles/nudgis/front/tasks/install.yml

 ---
 
 - name: "Nudgis Front install"
-  ansible.builtin.apt:
-    force_apt_get: true
-    install_recommends: false
-    name: "{{ nudgis_front_packages }}"
-  register: apt_status
-  retries: 60
-  until: apt_status is success or ('Failed to lock apt for exclusive operation' not in apt_status.msg and '/var/lib/dpkg/lock' not in apt_status.msg)
+  ansible.builtin.import_role:
+    name: "nudgis/shared"
+    tasks_from: "apt_install.yml"
+  vars:
+    apt_packages: "{{ nudgis_front_packages }}"
 
-- name: "Nudgis Front online packages"
+- name: "Nudgis Front online packages install"
   when: not offline_mode
-  ansible.builtin.apt:
-    force_apt_get: true
-    install_recommends: false
-    name: "{{ nudgis_front_online_packages }}"
-  register: apt_status
-  retries: 60
-  until: apt_status is success or ('Failed to lock apt for exclusive operation' not in apt_status.msg and '/var/lib/dpkg/lock' not in apt_status.msg)
+  ansible.builtin.import_role:
+    name: "nudgis/shared"
+    tasks_from: "apt_install.yml"
+  vars:
+    apt_packages: "{{ nudgis_front_online_packages }}"
 
 ...

roles/nudgis/front/vars/main.yml

@@ -24,7 +24,7 @@ nudgis_front_online_packages:
   - ubicast-web-access
 
 # Group firewall rules filename, see roles/shared/files/nftables/
-firewall_rules_files:
+nudgis_firewall_rules_files:
   - http
 
 ...

roles/nudgis/haproxy/tasks/install.yml

 ---
 
 - name: "Install packages"
-  ansible.builtin.apt:
-    force_apt_get: true
-    install_recommends: false
-    name: "{{ hap_packages }}"
-  register: apt_status
-  retries: 60
-  until: apt_status is success or ('Failed to lock apt for exclusive operation' not in apt_status.msg and '/var/lib/dpkg/lock' not in apt_status.msg)
+  ansible.builtin.import_role:
+    name: "nudgis/shared"
+    tasks_from: "apt_install.yml"
+  vars:
+    apt_packages: "{{ hap_packages }}"
 
 ...

roles/nudgis/import/tasks/base.yml

@@ -52,7 +52,11 @@
 
 # FIREWALL
 
-- ansible.builtin.import_tasks: ../../shared/tasks/firewall_rules_files.yml
+- ansible.builtin.import_role:
+    name: "nudgis/shared"
+    tasks_from: "firewall_rules_files.yml"
+  vars:
+    firewall_rules_files: "{{ import_firewall_rules_files }}"
 
 - name: "Flush handlers"
   ansible.builtin.meta: flush_handlers

roles/nudgis/import/vars/main.yml

@@ -6,7 +6,7 @@ import_packages:
   - ubicast-mediaimport
 
 # Group firewall rules filename, see roles/shared/files/nftables/
-firewall_rules_files:
+import_firewall_rules_files:
   - ftp
 
 ...

roles/nudgis/live/tasks/base.yml

@@ -9,7 +9,11 @@
 #     group: root
 #     mode: "0700"
 
-- ansible.builtin.import_tasks: ../../shared/tasks/firewall_rules_files.yml
+- ansible.builtin.import_role:
+    name: "nudgis/shared"
+    tasks_from: "firewall_rules_files.yml"
+  vars:
+    firewall_rules_files: "{{ live_firewall_rules_files }}"
 
 - name: "Flush handlers"
   ansible.builtin.meta: flush_handlers

roles/nudgis/live/tasks/install.yml

 ---
 
 - name: "Live packages installation"
-  ansible.builtin.apt:
-    force_apt_get: true
-    install_recommends: false
-    name: "{{ live_packages }}"
-    state: present
-  register: apt_status
-  retries: 60
-  until: apt_status is success or ('Failed to lock apt for exclusive operation' not in apt_status.msg and '/var/lib/dpkg/lock' not in apt_status.msg)
+  ansible.builtin.import_role:
+    name: "nudgis/shared"
+    tasks_from: "apt_install.yml"
+  vars:
+    apt_packages: "{{ live_packages }}"
 
 ...

roles/nudgis/live/vars/main.yml

@@ -5,7 +5,7 @@ live_packages:
   - ubicast-live
 
 # Group firewall rules filename, see roles/shared/files/nftables/
-firewall_rules_files:
+live_firewall_rules_files:
   - http
   - rtmp
 

roles/nudgis/lxc/tasks/install.yml

 ---
 
 - name: "LXC packages installation"
-  ansible.builtin.apt:
-    force_apt_get: true
-    name:
+  ansible.builtin.import_role:
+    name: "nudgis/shared"
+    tasks_from: "apt_install.yml"
+  vars:
+    apt_packages:
       - lxc
       - lxcfs
       - bridge-utils
-    state: present
-  register: apt_status
-  retries: 60
-  until: apt_status is success or ('Failed to lock apt for exclusive operation' not in apt_status.msg and '/var/lib/dpkg/lock' not in apt_status.msg)
 
 ...

roles/nudgis/manager/tasks/base.yml

@@ -13,7 +13,11 @@
     mode: "preserve"
     remote_src: true
 
-- ansible.builtin.import_tasks: ../../shared/tasks/firewall_rules_files.yml
+- ansible.builtin.import_role:
+    name: "nudgis/shared"
+    tasks_from: "firewall_rules_files.yml"
+  vars:
+    firewall_rules_files: "{{ manager_firewall_rules_files }}"
 
 - name: "Flush handlers"
   ansible.builtin.meta: flush_handlers

roles/nudgis/manager/tasks/install.yml

 ---
 
 - name: "Nudgis Manager dependencies install"
-  ansible.builtin.apt:
-    force_apt_get: true
-    install_recommends: false
-    name: "{{ dependencies_packages }}"
-  register: apt_status
-  retries: 60
-  until: apt_status is success or ('Failed to lock apt for exclusive operation' not in apt_status.msg and '/var/lib/dpkg/lock' not in apt_status.msg)
+  ansible.builtin.import_role:
+    name: "nudgis/shared"
+    tasks_from: "apt_install.yml"
+  vars:
+    apt_packages: "{{ dependencies_packages }}"
 
 - name: "Nudgis Manager install"
-  ansible.builtin.apt:
-    force_apt_get: true
-    install_recommends: false
-    name: "{{ manager_packages }}"
-  register: apt_status
-  retries: 60
-  until: apt_status is success or ('Failed to lock apt for exclusive operation' not in apt_status.msg and '/var/lib/dpkg/lock' not in apt_status.msg)
+  ansible.builtin.import_role:
+    name: "nudgis/shared"
+    tasks_from: "apt_install.yml"
+  vars:
+    apt_packages: "{{ manager_packages }}"
 
 - name: "Nudgis Manager online packages"
   when: not offline_mode
-  ansible.builtin.apt:
-    force_apt_get: true
-    install_recommends: false
-    name: "{{ manager_online_packages }}"
-  register: apt_status
-  retries: 60
-  until: apt_status is success or ('Failed to lock apt for exclusive operation' not in apt_status.msg and '/var/lib/dpkg/lock' not in apt_status.msg)
+  ansible.builtin.import_role:
+    name: "nudgis/shared"
+    tasks_from: "apt_install.yml"
+  vars:
+    apt_packages: "{{ manager_online_packages }}"
 
 ...

roles/nudgis/manager/vars/main.yml

@@ -16,7 +16,7 @@ manager_online_packages:
   - ubicast-web-access
 
 # Group firewall rules filename, see roles/shared/files/nftables/
-firewall_rules_files:
+manager_firewall_rules_files:
   - http
 
 ...

roles/nudgis/monitor/client/tasks/base.yml

 ---
 
-- ansible.builtin.import_tasks: ../../shared/tasks/firewall_rules_files.yml
+- ansible.builtin.import_role:
+    name: "nudgis/shared"
+    tasks_from: "firewall_rules_files.yml"
+  vars:
+    firewall_rules_files: "{{ monitor_client_firewall_rules_files }}"
 
 ...