Convert deprecated 'include' to 'ansible.builtin.include_tasks' and
while we are here, add the 'ansible.builtin' prefix to 'include_vars'.
Change-Id: I10c06ab9436a8edd23922f1b0b57fb063f3b387c
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
13 files changed:
---
# Include variables and define needed variables.
- name: Include OS-specific variables.
---
# 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"
with_first_found:
- "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml"
- "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
- "{{ ansible_os_family }}.yml"
# Setup/install tasks.
- "{{ 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']
when: ansible_os_family in ['RedHat', 'Rocky']
-- include: setup-Debian.yml
+- ansible.builtin.include_tasks: setup-Debian.yml
when: ansible_os_family == 'Debian'
when: ansible_os_family == 'Debian'
-- include: setup-Alpine.yml
+- ansible.builtin.include_tasks: setup-Alpine.yml
when: ansible_os_family == 'Alpine'
when: ansible_os_family == 'Alpine'
-- include: setup-Suse.yml
+- ansible.builtin.include_tasks: setup-Suse.yml
when: ansible_os_family == 'Suse'
when: ansible_os_family == 'Suse'
---
# Include variables and define needed variables.
- name: Include OS-specific variables.
---
# 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 }}.yml"
- "{{ ansible_distribution }}.yml"
- "{{ ansible_os_family }}.yml"
# Setup/install tasks.
with_first_found:
- "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
- "{{ ansible_distribution }}.yml"
- "{{ 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']
when: ansible_os_family in ['RedHat', 'Rocky']
-- include: setup-Debian.yml
+- ansible.builtin.include_tasks: setup-Debian.yml
when: ansible_os_family == 'Debian'
when: ansible_os_family == 'Debian'
-- include: setup-Alpine.yml
+- ansible.builtin.include_tasks: setup-Alpine.yml
when: ansible_os_family == 'Alpine'
when: ansible_os_family == 'Alpine'
-- include: setup-Suse.yml
+- ansible.builtin.include_tasks: setup-Suse.yml
when: ansible_os_family == 'Suse'
when: ansible_os_family == 'Suse'
---
# Include variables and define needed variables.
- name: Include OS-specific variables.
---
# 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"
with_first_found:
- "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml"
- "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
- "{{ ansible_os_family }}.yml"
# Setup/install tasks.
- "{{ 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']
when: ansible_os_family in ['RedHat', 'Rocky']
-- include: setup-Debian.yml
+- ansible.builtin.include_tasks: setup-Debian.yml
when: ansible_os_family == 'Debian'
when: ansible_os_family == 'Debian'
-- include: setup-Alpine.yml
+- ansible.builtin.include_tasks: setup-Alpine.yml
when: ansible_os_family == 'Alpine'
when: ansible_os_family == 'Alpine'
-- include: setup-Suse.yml
+- ansible.builtin.include_tasks: setup-Suse.yml
when: ansible_os_family == 'Suse'
- when: common_node_rootfs_readonly_reboot|default(false)
when: ansible_os_family == 'Suse'
- when: common_node_rootfs_readonly_reboot|default(false)
---
# Include variables and define needed variables.
- name: Include OS-specific variables.
---
# 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"
with_first_found:
- "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml"
- "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
- "{{ ansible_os_family }}.yml"
# Setup/install tasks.
- "{{ 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']
when: ansible_os_family in ['RedHat', 'Rocky']
-- include: setup-Debian.yml
+- ansible.builtin.include_tasks: setup-Debian.yml
when: ansible_os_family == 'Debian'
when: ansible_os_family == 'Debian'
-- include: setup-Alpine.yml
+- ansible.builtin.include_tasks: setup-Alpine.yml
when: ansible_os_family == 'Alpine'
when: ansible_os_family == 'Alpine'
-- include: setup-Suse.yml
+- ansible.builtin.include_tasks: setup-Suse.yml
when: ansible_os_family == 'Suse'
when: ansible_os_family == 'Suse'
-- include: setup-Windows.yml
+- ansible.builtin.include_tasks: setup-Windows.yml
when: ansible_os_family == 'Windows'
# Setup user accounts
when: ansible_os_family == 'Windows'
# Setup user accounts
+- ansible.builtin.include_tasks: users.yml
when: ansible_os_family != 'Windows'
when: ansible_os_family != 'Windows'
-- include: users-Windows.yml
+- ansible.builtin.include_tasks: users-Windows.yml
when: ansible_os_family == 'Windows'
when: ansible_os_family == 'Windows'
---
# Include variables and define needed variables.
- name: Include OS-specific variables.
---
# 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 }}.yml"
- "{{ ansible_distribution }}-{{ ansible_distribution_release }}.yml"
with_first_found:
- "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
- "{{ ansible_distribution }}-{{ ansible_distribution_release }}.yml"
- "{{ ansible_os_family }}.yml"
# Setup/install tasks.
- "{{ 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']
when: ansible_os_family in ['RedHat', 'Rocky']
-- include: setup-Debian.yml
+- ansible.builtin.include_tasks: setup-Debian.yml
when: ansible_os_family == 'Debian'
when: ansible_os_family == 'Debian'
-- include: setup-Alpine.yml
+- ansible.builtin.include_tasks: setup-Alpine.yml
when: ansible_os_family == 'Alpine'
when: ansible_os_family == 'Alpine'
-- include: setup-Suse.yml
+- ansible.builtin.include_tasks: setup-Suse.yml
when: ansible_os_family == 'Suse'
when: ansible_os_family == 'Suse'
---
# Include variables and define needed variables.
- name: Include OS-specific variables.
---
# 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 }}.yml"
- "{{ ansible_distribution }}-{{ ansible_distribution_release }}.yml"
with_first_found:
- "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
- "{{ ansible_distribution }}-{{ ansible_distribution_release }}.yml"
- "{{ ansible_os_family }}.yml"
# Setup/install tasks.
- "{{ 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']
when: ansible_os_family in ['RedHat', 'Rocky']
-- include: setup-Debian.yml
+- ansible.builtin.include_tasks: setup-Debian.yml
when: ansible_os_family == 'Debian'
when: ansible_os_family == 'Debian'
-- include: setup-Alpine.yml
+- ansible.builtin.include_tasks: setup-Alpine.yml
when: ansible_os_family == 'Alpine'
when: ansible_os_family == 'Alpine'
---
# Include variables and define needed variables.
- name: Include OS-specific variables.
---
# 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 }}.yml"
- "{{ ansible_distribution }}.yml"
- "{{ ansible_os_family }}.yml"
# Setup/install tasks.
with_first_found:
- "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
- "{{ ansible_distribution }}.yml"
- "{{ 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']
when: ansible_os_family in ['RedHat', 'Rocky']
-- include: setup-Debian.yml
+- ansible.builtin.include_tasks: setup-Debian.yml
when: ansible_os_family == 'Debian'
when: ansible_os_family == 'Debian'
-- include: setup-Alpine.yml
+- ansible.builtin.include_tasks: setup-Alpine.yml
when: ansible_os_family == 'Alpine'
when: ansible_os_family == 'Alpine'
-- include: setup-Suse.yml
+- ansible.builtin.include_tasks: setup-Suse.yml
when: ansible_os_family == 'Suse'
when: ansible_os_family == 'Suse'
---
# Include variables and define needed variables.
- name: Include OS-specific variables.
---
# Include variables and define needed variables.
- name: Include OS-specific variables.
- include_vars: "{{ ansible_os_family }}.yml"
+ ansible.builtin.include_vars: "{{ ansible_os_family }}.yml"
- name: Define libs_i386_packages.
set_fact:
libs_i386_packages: "{{ __libs_i386_packages | list }}"
when: libs_i386_packages is not defined
- name: Define libs_i386_packages.
set_fact:
libs_i386_packages: "{{ __libs_i386_packages | list }}"
when: libs_i386_packages is not defined
-- include: setup-Debian.yml
+- ansible.builtin.include_tasks: setup-Debian.yml
when: ansible_os_family == 'Debian'
# Install libs from the default package manager
when: ansible_os_family == 'Debian'
# Install libs from the default package manager
---
# Include variables and define needed variables.
- name: Include OS-specific variables.
---
# 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 }}.yml"
- "{{ ansible_distribution }}.yml"
- "{{ ansible_os_family }}.yml"
# Setup/install tasks.
with_first_found:
- "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
- "{{ ansible_distribution }}.yml"
- "{{ 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']
when: ansible_os_family in ['RedHat', 'Rocky']
-- include: setup-Debian.yml
+- ansible.builtin.include_tasks: setup-Debian.yml
when: ansible_os_family == 'Debian'
when: ansible_os_family == 'Debian'
-- include: setup-Alpine.yml
+- ansible.builtin.include_tasks: setup-Alpine.yml
when: ansible_os_family == 'Alpine'
when: ansible_os_family == 'Alpine'
-- include: setup-Suse.yml
+- ansible.builtin.include_tasks: setup-Suse.yml
when: ansible_os_family == 'Suse'
when: ansible_os_family == 'Suse'
---
# Include variables and define needed variables.
- name: Include OS-specific variables.
---
# 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 }}.yml"
- "{{ ansible_distribution }}.yml"
- "{{ ansible_os_family }}.yml"
# Setup/install tasks.
with_first_found:
- "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
- "{{ ansible_distribution }}.yml"
- "{{ 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']
when: ansible_os_family in ['RedHat', 'Rocky']
-- include: setup-Debian.yml
+- ansible.builtin.include_tasks: setup-Debian.yml
when: ansible_os_family == 'Debian'
when: ansible_os_family == 'Debian'
-- include: setup-Alpine.yml
+- ansible.builtin.include_tasks: setup-Alpine.yml
when: ansible_os_family == 'Alpine'
when: ansible_os_family == 'Alpine'
-- include: setup-Suse.yml
+- ansible.builtin.include_tasks: setup-Suse.yml
when: ansible_os_family == 'Suse'
- name: checkout repo
when: ansible_os_family == 'Suse'
- name: checkout repo
---
# Include variables and define needed variables.
- name: Include OS-specific variables.
---
# 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 }}.yml"
- "{{ ansible_distribution }}.yml"
- "{{ ansible_os_family }}.yml"
# Setup/install tasks.
with_first_found:
- "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
- "{{ ansible_distribution }}.yml"
- "{{ 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']
when: ansible_os_family in ['RedHat', 'Rocky']
-- include: setup-Debian.yml
+- ansible.builtin.include_tasks: setup-Debian.yml
when: ansible_os_family == 'Debian'
when: ansible_os_family == 'Debian'
-- include: setup-Alpine.yml
+- ansible.builtin.include_tasks: setup-Alpine.yml
when: ansible_os_family == 'Alpine'
when: ansible_os_family == 'Alpine'
-- include: setup-Suse.yml
+- ansible.builtin.include_tasks: setup-Suse.yml
when: ansible_os_family == 'Suse'
when: ansible_os_family == 'Suse'
---
# Include variables and define needed variables.
- name: Include OS-specific variables.
---
# 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 }}.yml"
- "{{ ansible_distribution }}.yml"
- "{{ ansible_os_family }}.yml"
# Setup/install tasks.
with_first_found:
- "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
- "{{ ansible_distribution }}.yml"
- "{{ 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']
when: ansible_os_family in ['RedHat', 'Rocky']
-- include: setup-Debian.yml
+- ansible.builtin.include_tasks: setup-Debian.yml
when: ansible_os_family == 'Debian'
when: ansible_os_family == 'Debian'
-- include: setup-Alpine.yml
+- ansible.builtin.include_tasks: setup-Alpine.yml
when: ansible_os_family == 'Alpine'
when: ansible_os_family == 'Alpine'
-- include: setup-Suse.yml
+- ansible.builtin.include_tasks: setup-Suse.yml
when: ansible_os_family == 'Suse'
when: ansible_os_family == 'Suse'
name: rasdaemon
state: started
enabled: true
name: rasdaemon
state: started
enabled: true
-- ansible.builtin.include: prometheus.yml
+- ansible.builtin.include_tasks: prometheus.yml