ansible: Add missing default variables for common-node

[lttng-ci.git] / automation / ansible / roles / binutils-gdb / tasks / main.yml

diff --git a/automation/ansible/roles/binutils-gdb/tasks/main.yml b/automation/ansible/roles/binutils-gdb/tasks/main.yml
index 733840c1d04d10bcb61b4337d0e47a1363e813a1..182d04766c689bbd58ac4aa5baceb0a60246b627 100644 (file)
--- a/automation/ansible/roles/binutils-gdb/tasks/main.yml
+++ b/automation/ansible/roles/binutils-gdb/tasks/main.yml
@@ -1,22 +1,21 @@
 ---
 # Include variables and define needed variables.
 - name: Include OS-specific variables.
-  include_vars: "{{ ansible_os_family }}.yml"
-
-- name: Define binutils_gdb_packages.
-  set_fact:
-    binutils_gdb_packages: "{{ __binutils_gdb_packages | list }}"
-  when: binutils_gdb_packages is not defined
+  ansible.builtin.include_vars: "{{ item }}"
+  with_first_found:
+    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
+    - "{{ ansible_distribution }}.yml"
+    - "{{ ansible_os_family }}.yml"
 
 # Setup/install tasks.
-- include: setup-RedHat.yml
-  when: ansible_os_family == 'RedHat'
+- ansible.builtin.include_tasks: setup-RedHat.yml
+  when: ansible_os_family in ['RedHat', 'Rocky']
 
-- include: setup-Debian.yml
+- ansible.builtin.include_tasks: setup-Debian.yml
   when: ansible_os_family == 'Debian'
 
-- include: setup-Alpine.yml
+- ansible.builtin.include_tasks: setup-Alpine.yml
   when: ansible_os_family == 'Alpine'
 
-- include: setup-Suse.yml
+- ansible.builtin.include_tasks: setup-Suse.yml
   when: ansible_os_family == 'Suse'