Fix deprecated includes

roles/alertmanager/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -23,8 +23,8 @@
       paths:
         - tasks
 
-- include: pre.yaml
+- ansible.builtin.include_tasks: pre.yaml
 
-- include: install.yaml
+- ansible.builtin.include_tasks: install.yaml
 
-- include: configure.yaml
+- ansible.builtin.include_tasks: configure.yaml

roles/autossh/tasks/main.yaml

@@ -12,7 +12,7 @@
     skeleton: /dev/null
 
 - name: "manage keys {{ item }}"
-  include: keys.yaml
+  ansible.builtin.include_tasks: keys.yaml
   loop:
     - id_dsa
     - id_ecdsa
@@ -33,7 +33,7 @@
     state: "{{ autossh_package_state }}"
 
 - name: manage keys "{{ item }}"
-  include: keys.yaml
+  ansible.builtin.include_tasks: keys.yaml
   loop:
     - id_dsa
     - id_ecdsa

roles/blackbox_exporter/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -23,8 +23,8 @@
       paths:
         - tasks
 
-- include: pre.yaml
+- ansible.builtin.include_tasks: pre.yaml
 
-- include: install.yaml
+- ansible.builtin.include_tasks: install.yaml
 
-- include: configure.yaml
+- ansible.builtin.include_tasks: configure.yaml

roles/certbot/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -37,7 +37,7 @@
     mode: 0755
 
 - name: request certificates
-  include_tasks: "issue.yaml"
+  ansible.builtin.include_tasks: "issue.yaml"
   loop: "{{ certbot_certificates }}"
 
 - name: configure systemd timer

roles/certs/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"

roles/chrony/tasks/main.yaml

@@ -1,6 +1,6 @@
 ---
 - name: gather OS specific variables
-  include_vars: "{{ item }}"
+  ansible.builtin.include_vars: "{{ item }}"
   with_first_found:
     - "{{ ansible_distribution }}.yaml"
     - "{{ ansible_os_family }}.yaml"

roles/common/tasks/main.yaml

@@ -1,15 +1,27 @@
 ---
 - name: gather OS specific variables
-  include_vars: "{{ item }}"
-  with_first_found:
-    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
-    - "{{ ansible_distribution }}.yaml"
-    - "{{ ansible_os_family }}.yaml"
+  ansible.builtin.include_vars: "{{ lookup('ansible.builtin.first_found', params) }}"
+  vars:
+    params:
+      files:
+        - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
+        - "{{ ansible_distribution }}.yaml"
+        - "{{ ansible_os_family }}.yaml"
+        - "default.yaml"
+      paths:
+        - vars
 
 - name: run os specific tasks
-  include: "{{ item }}"
-  with_first_found:
-    - "{{ ansible_os_family }}.yaml"
+  ansible.builtin.include_tasks: "{{ lookup('ansible.builtin.first_found', params) }}"
+  vars:
+    params:
+      files:
+        - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
+        - "{{ ansible_distribution }}.yaml"
+        - "{{ ansible_os_family }}.yaml"
+        - "default.yaml"
+      paths:
+        - tasks
 
 - name: set hostname
   hostname:

roles/consul/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -43,5 +43,5 @@
     state: "{{ consul_service_state | default('started') }}"
     enabled: "{{ consul_service_enabled | default(true) }}"
 
-- include: forward-unbound.yaml
+- ansible.builtin.include_tasks: forward-unbound.yaml
   when: consul_unbound_enabled

roles/crio/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"

roles/dns/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"

roles/docker/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -23,6 +23,6 @@
       paths:
         - tasks
 
-- include: install.yaml
+- ansible.builtin.include_tasks: install.yaml
 
-- include: configure.yaml
+- ansible.builtin.include_tasks: configure.yaml

roles/firewall/tasks/main.yaml

@@ -1,6 +1,6 @@
 ---
 - name: gather OS specific variables
-  include_vars: "{{ item }}"
+  ansible.builtin.include_vars: "{{ item }}"
   with_first_found:
     - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
     - "{{ ansible_distribution }}.yaml"

roles/gitea/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -23,13 +23,13 @@
       paths:
         - tasks
 
-- include: pre.yaml
+- ansible.builtin.include_tasks: pre.yaml
 
-- include: install.yaml
+- ansible.builtin.include_tasks: install.yaml
   when:
     - gitea_version is version(gitea_local_version, '>')
 
-- include: configure.yaml
+- ansible.builtin.include_tasks: configure.yaml
 
-- include: nginx.yaml
+- ansible.builtin.include_tasks: nginx.yaml
   when: '"nginx" in ansible_play_role_names'

roles/go/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather architecture specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_userspace_architecture }}.yaml"
         - "default.yaml"
@@ -21,9 +21,9 @@
   when: st.stat.exists is defined and st.stat.exists
 
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"

roles/grafana/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -23,9 +23,9 @@
         - tasks
 
 - name: include os family specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_os_family }}.yaml"
         - "default.yaml"
@@ -93,5 +93,5 @@
     enabled: "{{ grafana_service_enabled }}"
 
 - name: configure nginx
-  include: nginx.yaml
+  ansible.builtin.include_tasks: nginx.yaml
   when: "'nginx' in ansible_play_role_names"

roles/grub/tasks/main.yaml

@@ -1,12 +1,24 @@
 ---
 - name: gather OS specific variables
-  include_vars: "{{ item }}"
-  with_first_found:
-    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
-    - "{{ ansible_distribution }}.yaml"
-    - "{{ ansible_os_family }}.yaml"
+  ansible.builtin.include_vars: "{{ lookup('ansible.builtin.first_found', params) }}"
+  vars:
+    params:
+      files:
+        - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
+        - "{{ ansible_distribution }}.yaml"
+        - "{{ ansible_os_family }}.yaml"
+        - "default.yaml"
+      paths:
+        - vars
 
 - name: run os specific tasks
-  include: "{{ item }}"
-  with_first_found:
-    - "{{ ansible_os_family }}.yaml"
+  ansible.builtin.include_tasks: "{{ lookup('ansible.builtin.first_found', params) }}"
+  vars:
+    params:
+      files:
+        - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
+        - "{{ ansible_distribution }}.yaml"
+        - "{{ ansible_os_family }}.yaml"
+        - "default.yaml"
+      paths:
+        - tasks

roles/influxdb/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"

roles/karma/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -23,8 +23,8 @@
       paths:
         - tasks
 
-- include: pre.yaml
+- ansible.builtin.include_tasks: pre.yaml
 
-- include: install.yaml
+- ansible.builtin.include_tasks: install.yaml
 
-- include: configure.yaml
+- ansible.builtin.include_tasks: configure.yaml

roles/kthxbye/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -23,8 +23,8 @@
       paths:
         - tasks
 
-- include: pre.yaml
+- ansible.builtin.include_tasks: pre.yaml
 
-- include: install.yaml
+- ansible.builtin.include_tasks: install.yaml
 
-- include: configure.yaml
+- ansible.builtin.include_tasks: configure.yaml

roles/loki/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -23,8 +23,8 @@
       paths:
         - tasks
 
-- include: pre.yaml
+- ansible.builtin.include_tasks: pre.yaml
 
-- include: install.yaml
+- ansible.builtin.include_tasks: install.yaml
 
-- include: configure.yaml
+- ansible.builtin.include_tasks: configure.yaml

roles/mtail/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -23,8 +23,8 @@
       paths:
         - tasks
 
-- include: pre.yaml
+- ansible.builtin.include_tasks: pre.yaml
 
-- include: install.yaml
+- ansible.builtin.include_tasks: install.yaml
 
-- include: configure.yaml
+- ansible.builtin.include_tasks: configure.yaml

roles/mysql/tasks/main.yml

@@ -1,12 +1,12 @@
 ---
 - name: gather OS distribution version specific variables
-  include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
+  ansible.builtin.include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
 
 - name: gather OS distribution specific variables
-  include_vars: "{{ ansible_distribution }}.yaml"
+  ansible.builtin.include_vars: "{{ ansible_distribution }}.yaml"
 
 - name: gather OS family specific variables
-  include_vars: "{{ ansible_os_family }}.yaml"
+  ansible.builtin.include_vars: "{{ ansible_os_family }}.yaml"
 
 - name: manage mysql package
   package:

roles/network/tasks/main.yml

@@ -1,10 +1,27 @@
 ---
 - name: gather OS specific variables
-  include_vars: "{{ item }}"
-  with_first_found:
-    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
-    - "{{ ansible_distribution }}.yaml"
-    - "{{ ansible_os_family }}.yaml"
+  ansible.builtin.include_vars: "{{ lookup('ansible.builtin.first_found', params) }}"
+  vars:
+    params:
+      files:
+        - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
+        - "{{ ansible_distribution }}.yaml"
+        - "{{ ansible_os_family }}.yaml"
+        - "default.yaml"
+      paths:
+        - vars
+
+- name: run os specific tasks
+  ansible.builtin.include_tasks: "{{ lookup('ansible.builtin.first_found', params) }}"
+  vars:
+    params:
+      files:
+        - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
+        - "{{ ansible_distribution }}.yaml"
+        - "{{ ansible_os_family }}.yaml"
+        - "default.yaml"
+      paths:
+        - tasks
 
 - name: systemd-networkd
   include: systemd-networkd.yml

roles/nginx/tasks/main.yml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -46,7 +46,7 @@
   notify: reload nginx
 
 - name: configure virtual hosts
-  include_tasks: vhost.yaml
+  ansible.builtin.include_tasks: vhost.yaml
   loop: "{{ nginx_vhosts | dict2items }}"
 
 - name: manage service

roles/node_exporter/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -23,10 +23,10 @@
       paths:
         - tasks
 
-- include: pre.yaml
+- ansible.builtin.include_tasks: pre.yaml
 
-- include: install.yaml
+- ansible.builtin.include_tasks: install.yaml
   when:
     - node_exporter_version is version(node_exporter_local_version, '>')
 
-- include: configure.yaml
+- ansible.builtin.include_tasks: configure.yaml

roles/nomad/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"

roles/openssh/tasks/main.yaml

@@ -1,6 +1,6 @@
 ---
 - name: gather OS specific variables
-  include_vars: "{{ item }}"
+  ansible.builtin.include_vars: "{{ item }}"
   with_first_found:
     - "{{ ansible_distribution }}.yaml"
     - "{{ ansible_os_family }}.yaml"

roles/openvpn/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -30,7 +30,7 @@
 
 
 - name: "manage instances {{ item }}"
-  include: instances.yaml
+  ansible.builtin.include_tasks: instances.yaml
   loop: "{{ openvpn_config.keys() | list }}"
   loop_control:
     loop_var: instance

roles/postfix/tasks/main.yaml

@@ -1,6 +1,6 @@
 ---
 - name: gather OS specific variables
-  include_vars: "{{ item }}"
+  ansible.builtin.include_vars: "{{ item }}"
   with_first_found:
     - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
     - "{{ ansible_distribution }}.yaml"

roles/prometheus/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -23,12 +23,11 @@
       paths:
         - tasks
 
-- include: pre.yaml
+- ansible.builtin.include_tasks: pre.yaml
 
-- include: install.yaml
+- ansible.builtin.include_tasks: install.yaml
 
-- include: configure.yaml
-  notify: restart prometheus
+- ansible.builtin.include_tasks: configure.yaml
 
-- include: nginx.yaml
+- ansible.builtin.include_tasks: nginx.yaml
   when: '"nginx" in ansible_play_role_names'

roles/promtail/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -23,8 +23,8 @@
       paths:
         - tasks
 
-- include: pre.yaml
+- ansible.builtin.include_tasks: pre.yaml
 
-- include: install.yaml
+- ansible.builtin.include_tasks: install.yaml
 
-- include: configure.yaml
+- ansible.builtin.include_tasks: configure.yaml

roles/pushgateway/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -23,11 +23,11 @@
       paths:
         - tasks
 
-- include: pre.yaml
+- ansible.builtin.include_tasks: pre.yaml
 
-- include: install.yaml
+- ansible.builtin.include_tasks: install.yaml
 
-- include: configure.yaml
+- ansible.builtin.include_tasks: configure.yaml
 
-  #- include: nginx.yaml
+  #- ansible.builtin.include_tasks: nginx.yaml
   #  when: '"nginx" in ansible_play_role_names'

roles/rabbitmq/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -29,7 +29,7 @@
     state: "{{ rabbitmq_package_state }}"
 
 - name: configure
-  include: configure.yaml
+  ansible.builtin.include_tasks: configure.yaml
 
 - name: manage service
   service:

roles/rclone/tasks/main.yaml

@@ -1,13 +1,13 @@
 ---
 - name: gather OS specific variables
-  include_vars: "{{ item }}"
+  ansible.builtin.include_vars: "{{ item }}"
   with_first_found:
     - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
     - "{{ ansible_distribution }}.yaml"
     - "{{ ansible_os_family }}.yaml"
 
 - name: OS specific tasks
-  include: "{{ item }}"
+  ansible.builtin.include_tasks: "{{ item }}"
   with_first_found:
     - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
     - "{{ ansible_distribution }}.yaml"

roles/restic/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -86,9 +86,9 @@
     - restic-job.sh
 
 - name: manage repos
-  include: repo.yaml
+  ansible.builtin.include_tasks: repo.yaml
   loop: "{{ restic_repos | default([]) }}"
 
 - name: manage jobs
-  include: job.yaml
+  ansible.builtin.include_tasks: job.yaml
   loop: "{{ restic_jobs | default([]) }}"

roles/rsyslog/tasks/main.yaml

@@ -1,5 +1,5 @@
 - name: gather OS specific variables
-  include_vars: "{{ item }}"
+  ansible.builtin.include_vars: "{{ item }}"
   with_first_found:
     - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
     - "{{ ansible_distribution }}.yaml"
@@ -21,7 +21,7 @@
   notify: restart rsyslog
 
 - name: configure archival format
-  include: archival.yaml
+  ansible.builtin.include_tasks: archival.yaml
 
 - name: configure default rules
   template:

roles/supervisor/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"

roles/telegraf/tasks/main.yaml

@@ -1,13 +1,13 @@
 ---
 #- name: gather OS specific variables
-#  include_vars: "{{ item }}"
+#  ansible.builtin.include_vars: "{{ item }}"
 #  with_first_found:
 #    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
 #    - "{{ ansible_distribution }}.yaml"
 #    - "{{ ansible_os_family }}.yaml"
 
 - name: run os specific tasks
-  include: "{{ item }}"
+  ansible.builtin.include_tasks: "{{ item }}"
   with_first_found:
     - "{{ ansible_os_family }}.yaml"
 

roles/teleport/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather architecture specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_userspace_architecture }}.yaml"
         - "default.yaml"
@@ -10,9 +10,9 @@
         - vars
 
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -22,9 +22,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"

roles/thanos/tasks/configure.yaml

@@ -59,5 +59,5 @@
   notify: restart thanos query frontend
 
 - name: configure thanos components
-  include: configure-component.yaml
+  ansible.builtin.include_tasks: configure-component.yaml
   loop: "{{ thanos_services }}"

roles/thanos/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -23,8 +23,8 @@
       paths:
         - tasks
 
-- include: pre.yaml
+- ansible.builtin.include_tasks: pre.yaml
 
-- include: install.yaml
+- ansible.builtin.include_tasks: install.yaml
 
-- include: configure.yaml
+- ansible.builtin.include_tasks: configure.yaml

roles/util/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"

roles/vault/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"

roles/vm_guest/tasks/main.yaml

@@ -1,17 +1,17 @@
 ---
 - name: gather OS specific variables
-  include_vars: "{{ item }}"
+  ansible.builtin.include_vars: "{{ item }}"
   with_first_found:
     - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
     - "{{ ansible_distribution }}.yaml"
     - "{{ ansible_os_family }}.yaml"
 
 - name: gather virtualization specific variables
-  include_vars: "{{ item }}"
+  ansible.builtin.include_vars: "{{ item }}"
   with_first_found:
     "{{ ansible_virtualization_type }}.yaml"
 
 - name: run virtualization specific tasks
-  include: "{{ item }}"
+  ansible.builtin.include_tasks: "{{ item }}"
   with_first_found:
     "{{ ansible_virtualization_type }}.yaml"

roles/wireguard/tasks/main.yaml

@@ -1,8 +1,8 @@
 ---
 - name: gather os specific variables
-  include_vars: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -12,9 +12,9 @@
         - vars
 
 - name: include os specific tasks
-  include_tasks: "{{ lookup('first_found', possible_files) }}"
+  ansible.builtin.include_tasks: "{{ lookup('first_found', params) }}"
   vars:
-    possible_files:
+    params:
       files:
         - "{{ ansible_distribution }}-{{ ansible_distribution_version }}.yaml"
         - "{{ ansible_distribution }}.yaml"
@@ -23,11 +23,11 @@
       paths:
         - tasks
 
-- include: install.yaml
+- ansible.builtin.include_tasks: install.yaml
 
-#- include: configure.yaml
+#- ansible.builtin.include_tasks: configure.yaml
 
-- include: configure-interface.yaml
+- ansible.builtin.include_tasks: configure-interface.yaml
   loop: "{{ wireguard_interfaces.keys() | list }}"
   loop_control:
     loop_var: _wireguard_interface