ansible: Enable Rocky PowerTools on Rocky Linux 8

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

diff --git a/automation/ansible/roles/common/tasks/main.yml b/automation/ansible/roles/common/tasks/main.yml
index a8798c55a5a06f35183f30febfbf03cc8215fe86..105eb40d0958e50f70ebfdefe353abc09893b9eb 100644 (file)
--- a/automation/ansible/roles/common/tasks/main.yml
+++ b/automation/ansible/roles/common/tasks/main.yml
@@ -3,6 +3,7 @@
 - name: Include OS-specific variables.
   include_vars: "{{ item }}"
   with_first_found:
+    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml"
     - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
     - "{{ ansible_distribution }}.yml"
     - "{{ ansible_os_family }}.yml"
@@ -21,17 +22,11 @@
   when: ansible_os_family == 'Suse'
 
 - include: setup-Windows.yml
-  when: ansible_os_family == "Windows"
+  when: ansible_os_family == 'Windows'
 
-- name: Set up authorized_keys for the root user
-  authorized_key:
-    user: 'root'
-    key: "{% for key in query('fileglob', 'public_keys/*.pub') %}{{ lookup('file', key) ~ '\n'}}{% endfor %}"
-    exclusive: true
+# Setup user accounts
+- include: users.yml
   when: ansible_os_family != 'Windows'
 
 - include: users-Windows.yml
-  when: ansible_os_family == "Windows"
-
-- include: users.yml
-  when: ansible_os_family != "Windows"
+  when: ansible_os_family == 'Windows'