X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=automation%2Fansible%2Froles%2Fcommon%2Ftasks%2Fmain.yml;h=6a562d4b8a9cf9e5c970be8593ac91b5cdedba07;hb=4302b78305ad469fbc474e5eea554e5f1b5e406e;hp=d901cf034f5d0094d27502c9cc852d106decf34c;hpb=42b9b3eba9ac7c3e2090668b01e6a297d8f81007;p=lttng-ci.git

diff --git a/automation/ansible/roles/common/tasks/main.yml b/automation/ansible/roles/common/tasks/main.yml
index d901cf0..6a562d4 100644
--- a/automation/ansible/roles/common/tasks/main.yml
+++ b/automation/ansible/roles/common/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 # Include variables and define needed variables.
 - name: Include OS-specific variables.
-  include_vars: "{{ item }}"
+  ansible.builtin.include_vars: "{{ item }}"
   with_first_found:
     - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml"
     - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
@@ -9,30 +9,24 @@
     - "{{ ansible_os_family }}.yml"
 
 # Setup/install tasks.
-- include: setup-RedHat.yml
+- 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'
 
-- include: setup-Windows.yml
-  when: ansible_os_family == "Windows"
+- ansible.builtin.include_tasks: setup-Windows.yml
+  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 %}\n{% for key in lookup('vars', 'extra_root_ssh_authorized_keys', default=[]) %}{{ key ~ '\n' }}{% endfor %}"
-    exclusive: true
+# Setup user accounts
+- ansible.builtin.include_tasks: users.yml
   when: ansible_os_family != 'Windows'
 
-- include: users-Windows.yml
-  when: ansible_os_family == "Windows"
-
-- include: users.yml
-  when: ansible_os_family != "Windows"
+- ansible.builtin.include_tasks: users-Windows.yml
+  when: ansible_os_family == 'Windows'