From 882d60515d6b5c2d4677fa4d54a855972de93347 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Tue, 20 Dec 2022 13:35:03 +0100
Subject: [PATCH] ipaserver role: Use FQCN for ansible.builtin
Use Fully Qualified Collection Name (FQCN) for ansible builtins. This is
ansible.builtin.set_fact instead of set_fact for example and aplies for
all actions that are part of ansible.builtin.
All the replaced ansible.builtins:
assert, command, copy, debug, fail, fetch, file, import_playbook,
import_tasks, include_role, include_tasks, include_vars, package,
set_fact, shell, slurp, stat, systemd
---
roles/ipaserver/tasks/copy_external_cert.yml | 6 ++--
roles/ipaserver/tasks/install.yml | 30 ++++++++++----------
roles/ipaserver/tasks/main.yml | 6 ++--
roles/ipaserver/tasks/uninstall.yml | 4 +--
4 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/roles/ipaserver/tasks/copy_external_cert.yml b/roles/ipaserver/tasks/copy_external_cert.yml
index e91b9c7f..8d30aca4 100644
--- a/roles/ipaserver/tasks/copy_external_cert.yml
+++ b/roles/ipaserver/tasks/copy_external_cert.yml
@@ -1,14 +1,14 @@
---
- name: Install - Initialize ipaserver_external_cert_files
- set_fact:
+ ansible.builtin.set_fact:
ipaserver_external_cert_files: []
when: ipaserver_external_cert_files is undefined
- name: Install - Copy "{{ item }}" "{{ inventory_hostname }}':/root/'{{ item | basename }}"
- copy:
+ ansible.builtin.copy:
src: "{{ item }}"
dest: "/root/{{ item | basename }}"
mode: preserve
force: yes
- name: Install - Extend ipaserver_external_cert_files with "/root/{{ item | basename }}"
- set_fact:
+ ansible.builtin.set_fact:
ipaserver_external_cert_files: "{{ ipaserver_external_cert_files + [ '/root/' + (item | basename) ] }}"
diff --git a/roles/ipaserver/tasks/install.yml b/roles/ipaserver/tasks/install.yml
index ad135d1a..70238d9c 100644
--- a/roles/ipaserver/tasks/install.yml
+++ b/roles/ipaserver/tasks/install.yml
@@ -3,24 +3,24 @@
- block:
- name: Install - Ensure that IPA server packages are installed
- package:
+ ansible.builtin.package:
name: "{{ ipaserver_packages }}"
state: present
- name: Install - Ensure that IPA server packages for dns are installed
- package:
+ ansible.builtin.package:
name: "{{ ipaserver_packages_dns }}"
state: present
when: ipaserver_setup_dns | bool
- name: Install - Ensure that IPA server packages for adtrust are installed
- package:
+ ansible.builtin.package:
name: "{{ ipaserver_packages_adtrust }}"
state: present
when: ipaserver_setup_adtrust | bool
- name: Install - Ensure that firewall packages installed
- package:
+ ansible.builtin.package:
name: "{{ ipaserver_packages_firewalld }}"
state: present
when: ipaserver_setup_firewalld | bool
@@ -29,20 +29,20 @@
- block:
- name: Firewalld service - Ensure that firewalld is running
- systemd:
+ ansible.builtin.systemd:
name: firewalld
enabled: yes
state: started
- name: Firewalld - Verify runtime zone "{{ ipaserver_firewalld_zone }}"
- shell: >
+ ansible.builtin.shell: >
firewall-cmd
--info-zone="{{ ipaserver_firewalld_zone }}"
>/dev/null
when: ipaserver_firewalld_zone is defined
- name: Firewalld - Verify permanent zone "{{ ipaserver_firewalld_zone }}"
- shell: >
+ ansible.builtin.shell: >
firewall-cmd
--permanent
--info-zone="{{ ipaserver_firewalld_zone }}"
@@ -51,7 +51,7 @@
when: ipaserver_setup_firewalld | bool
-- include_tasks: "{{ role_path }}/tasks/copy_external_cert.yml"
+- ansible.builtin.include_tasks: "{{ role_path }}/tasks/copy_external_cert.yml"
with_items: "{{ ipaserver_external_cert_files_from_controller }}"
when: ipaserver_external_cert_files_from_controller is defined and
ipaserver_external_cert_files_from_controller|length > 0 and
@@ -144,7 +144,7 @@
- name: Install - Use new master password
no_log: yes
- set_fact:
+ ansible.builtin.set_fact:
ipaserver_master_password:
"{{ result_ipaserver_master_password.password }}"
@@ -308,7 +308,7 @@
register: result_ipaserver_setup_ca
- name: Copy /root/ipa.csr to "{{ inventory_hostname }}-ipa.csr"
- fetch:
+ ansible.builtin.fetch:
src: /root/ipa.csr
dest: "{{ inventory_hostname }}-ipa.csr"
flat: yes
@@ -416,7 +416,7 @@
_dirsrv_pkcs12_info: "{{ result_ipaserver_test._dirsrv_pkcs12_info if result_ipaserver_test._dirsrv_pkcs12_info != None else omit }}"
- name: Install - Setup client
- include_role:
+ ansible.builtin.include_role:
name: ipaclient
vars:
state: present
@@ -438,13 +438,13 @@
register: result_ipaserver_enable_ipa
- name: Install - Cleanup root IPA cache
- file:
+ ansible.builtin.file:
path: "/root/.ipa_cache"
state: absent
when: result_ipaserver_enable_ipa.changed
- name: Install - Configure firewalld
- command: >
+ ansible.builtin.command: >
firewall-cmd
--permanent
--zone="{{ ipaserver_firewalld_zone if ipaserver_firewalld_zone is
@@ -458,7 +458,7 @@
when: ipaserver_setup_firewalld | bool
- name: Install - Configure firewalld runtime
- command: >
+ ansible.builtin.command: >
firewall-cmd
--zone="{{ ipaserver_firewalld_zone if ipaserver_firewalld_zone is
defined else '' }}"
@@ -474,7 +474,7 @@
always:
- name: Cleanup temporary files
- file:
+ ansible.builtin.file:
path: "{{ item }}"
state: absent
with_items:
diff --git a/roles/ipaserver/tasks/main.yml b/roles/ipaserver/tasks/main.yml
index 23f8aec4..8e8d9b8e 100644
--- a/roles/ipaserver/tasks/main.yml
+++ b/roles/ipaserver/tasks/main.yml
@@ -2,7 +2,7 @@
# tasks file for ipaserver
- name: Import variables specific to distribution
- include_vars: "{{ item }}"
+ ansible.builtin.include_vars: "{{ item }}"
with_first_found:
- "vars/{{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_version'] }}.yml"
- "vars/{{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_major_version'] }}.yml"
@@ -17,9 +17,9 @@
- "vars/default.yml"
- name: Install IPA server
- include_tasks: install.yml
+ ansible.builtin.include_tasks: install.yml
when: state|default('present') == 'present'
- name: Uninstall IPA server
- include_tasks: uninstall.yml
+ ansible.builtin.include_tasks: uninstall.yml
when: state|default('present') == 'absent'
diff --git a/roles/ipaserver/tasks/uninstall.yml b/roles/ipaserver/tasks/uninstall.yml
index 27d8356a..7b69f229 100644
--- a/roles/ipaserver/tasks/uninstall.yml
+++ b/roles/ipaserver/tasks/uninstall.yml
@@ -2,7 +2,7 @@
# tasks to uninstall IPA server
- name: Uninstall - Uninstall IPA server
- command: >
+ ansible.builtin.command: >
/usr/sbin/ipa-server-install
--uninstall
-U
@@ -15,6 +15,6 @@
changed_when: uninstall.rc == 0
#- name: Remove IPA server packages
-# package:
+# ansible.builtin.package:
# name: "{{ ipaserver_packages }}"
# state: absent
--
GitLab