Skip to content
Snippets Groups Projects
Commit 882d6051 authored by Thomas Woerner's avatar Thomas Woerner
Browse files

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
parent c5ba88d7
No related branches found
No related tags found
No related merge requests found
--- ---
- name: Install - Initialize ipaserver_external_cert_files - name: Install - Initialize ipaserver_external_cert_files
set_fact: ansible.builtin.set_fact:
ipaserver_external_cert_files: [] ipaserver_external_cert_files: []
when: ipaserver_external_cert_files is undefined when: ipaserver_external_cert_files is undefined
- name: Install - Copy "{{ item }}" "{{ inventory_hostname }}':/root/'{{ item | basename }}" - name: Install - Copy "{{ item }}" "{{ inventory_hostname }}':/root/'{{ item | basename }}"
copy: ansible.builtin.copy:
src: "{{ item }}" src: "{{ item }}"
dest: "/root/{{ item | basename }}" dest: "/root/{{ item | basename }}"
mode: preserve mode: preserve
force: yes force: yes
- name: Install - Extend ipaserver_external_cert_files with "/root/{{ item | basename }}" - 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) ] }}" ipaserver_external_cert_files: "{{ ipaserver_external_cert_files + [ '/root/' + (item | basename) ] }}"
...@@ -3,24 +3,24 @@ ...@@ -3,24 +3,24 @@
- block: - block:
- name: Install - Ensure that IPA server packages are installed - name: Install - Ensure that IPA server packages are installed
package: ansible.builtin.package:
name: "{{ ipaserver_packages }}" name: "{{ ipaserver_packages }}"
state: present state: present
- name: Install - Ensure that IPA server packages for dns are installed - name: Install - Ensure that IPA server packages for dns are installed
package: ansible.builtin.package:
name: "{{ ipaserver_packages_dns }}" name: "{{ ipaserver_packages_dns }}"
state: present state: present
when: ipaserver_setup_dns | bool when: ipaserver_setup_dns | bool
- name: Install - Ensure that IPA server packages for adtrust are installed - name: Install - Ensure that IPA server packages for adtrust are installed
package: ansible.builtin.package:
name: "{{ ipaserver_packages_adtrust }}" name: "{{ ipaserver_packages_adtrust }}"
state: present state: present
when: ipaserver_setup_adtrust | bool when: ipaserver_setup_adtrust | bool
- name: Install - Ensure that firewall packages installed - name: Install - Ensure that firewall packages installed
package: ansible.builtin.package:
name: "{{ ipaserver_packages_firewalld }}" name: "{{ ipaserver_packages_firewalld }}"
state: present state: present
when: ipaserver_setup_firewalld | bool when: ipaserver_setup_firewalld | bool
...@@ -29,20 +29,20 @@ ...@@ -29,20 +29,20 @@
- block: - block:
- name: Firewalld service - Ensure that firewalld is running - name: Firewalld service - Ensure that firewalld is running
systemd: ansible.builtin.systemd:
name: firewalld name: firewalld
enabled: yes enabled: yes
state: started state: started
- name: Firewalld - Verify runtime zone "{{ ipaserver_firewalld_zone }}" - name: Firewalld - Verify runtime zone "{{ ipaserver_firewalld_zone }}"
shell: > ansible.builtin.shell: >
firewall-cmd firewall-cmd
--info-zone="{{ ipaserver_firewalld_zone }}" --info-zone="{{ ipaserver_firewalld_zone }}"
>/dev/null >/dev/null
when: ipaserver_firewalld_zone is defined when: ipaserver_firewalld_zone is defined
- name: Firewalld - Verify permanent zone "{{ ipaserver_firewalld_zone }}" - name: Firewalld - Verify permanent zone "{{ ipaserver_firewalld_zone }}"
shell: > ansible.builtin.shell: >
firewall-cmd firewall-cmd
--permanent --permanent
--info-zone="{{ ipaserver_firewalld_zone }}" --info-zone="{{ ipaserver_firewalld_zone }}"
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
when: ipaserver_setup_firewalld | bool 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 }}" with_items: "{{ ipaserver_external_cert_files_from_controller }}"
when: ipaserver_external_cert_files_from_controller is defined and when: ipaserver_external_cert_files_from_controller is defined and
ipaserver_external_cert_files_from_controller|length > 0 and ipaserver_external_cert_files_from_controller|length > 0 and
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
- name: Install - Use new master password - name: Install - Use new master password
no_log: yes no_log: yes
set_fact: ansible.builtin.set_fact:
ipaserver_master_password: ipaserver_master_password:
"{{ result_ipaserver_master_password.password }}" "{{ result_ipaserver_master_password.password }}"
...@@ -308,7 +308,7 @@ ...@@ -308,7 +308,7 @@
register: result_ipaserver_setup_ca register: result_ipaserver_setup_ca
- name: Copy /root/ipa.csr to "{{ inventory_hostname }}-ipa.csr" - name: Copy /root/ipa.csr to "{{ inventory_hostname }}-ipa.csr"
fetch: ansible.builtin.fetch:
src: /root/ipa.csr src: /root/ipa.csr
dest: "{{ inventory_hostname }}-ipa.csr" dest: "{{ inventory_hostname }}-ipa.csr"
flat: yes flat: yes
...@@ -416,7 +416,7 @@ ...@@ -416,7 +416,7 @@
_dirsrv_pkcs12_info: "{{ result_ipaserver_test._dirsrv_pkcs12_info if result_ipaserver_test._dirsrv_pkcs12_info != None else omit }}" _dirsrv_pkcs12_info: "{{ result_ipaserver_test._dirsrv_pkcs12_info if result_ipaserver_test._dirsrv_pkcs12_info != None else omit }}"
- name: Install - Setup client - name: Install - Setup client
include_role: ansible.builtin.include_role:
name: ipaclient name: ipaclient
vars: vars:
state: present state: present
...@@ -438,13 +438,13 @@ ...@@ -438,13 +438,13 @@
register: result_ipaserver_enable_ipa register: result_ipaserver_enable_ipa
- name: Install - Cleanup root IPA cache - name: Install - Cleanup root IPA cache
file: ansible.builtin.file:
path: "/root/.ipa_cache" path: "/root/.ipa_cache"
state: absent state: absent
when: result_ipaserver_enable_ipa.changed when: result_ipaserver_enable_ipa.changed
- name: Install - Configure firewalld - name: Install - Configure firewalld
command: > ansible.builtin.command: >
firewall-cmd firewall-cmd
--permanent --permanent
--zone="{{ ipaserver_firewalld_zone if ipaserver_firewalld_zone is --zone="{{ ipaserver_firewalld_zone if ipaserver_firewalld_zone is
...@@ -458,7 +458,7 @@ ...@@ -458,7 +458,7 @@
when: ipaserver_setup_firewalld | bool when: ipaserver_setup_firewalld | bool
- name: Install - Configure firewalld runtime - name: Install - Configure firewalld runtime
command: > ansible.builtin.command: >
firewall-cmd firewall-cmd
--zone="{{ ipaserver_firewalld_zone if ipaserver_firewalld_zone is --zone="{{ ipaserver_firewalld_zone if ipaserver_firewalld_zone is
defined else '' }}" defined else '' }}"
...@@ -474,7 +474,7 @@ ...@@ -474,7 +474,7 @@
always: always:
- name: Cleanup temporary files - name: Cleanup temporary files
file: ansible.builtin.file:
path: "{{ item }}" path: "{{ item }}"
state: absent state: absent
with_items: with_items:
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# tasks file for ipaserver # tasks file for ipaserver
- name: Import variables specific to distribution - name: Import variables specific to distribution
include_vars: "{{ item }}" ansible.builtin.include_vars: "{{ item }}"
with_first_found: with_first_found:
- "vars/{{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_version'] }}.yml" - "vars/{{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_version'] }}.yml"
- "vars/{{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_major_version'] }}.yml" - "vars/{{ ansible_facts['distribution'] }}-{{ ansible_facts['distribution_major_version'] }}.yml"
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
- "vars/default.yml" - "vars/default.yml"
- name: Install IPA server - name: Install IPA server
include_tasks: install.yml ansible.builtin.include_tasks: install.yml
when: state|default('present') == 'present' when: state|default('present') == 'present'
- name: Uninstall IPA server - name: Uninstall IPA server
include_tasks: uninstall.yml ansible.builtin.include_tasks: uninstall.yml
when: state|default('present') == 'absent' when: state|default('present') == 'absent'
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# tasks to uninstall IPA server # tasks to uninstall IPA server
- name: Uninstall - Uninstall IPA server - name: Uninstall - Uninstall IPA server
command: > ansible.builtin.command: >
/usr/sbin/ipa-server-install /usr/sbin/ipa-server-install
--uninstall --uninstall
-U -U
...@@ -15,6 +15,6 @@ ...@@ -15,6 +15,6 @@
changed_when: uninstall.rc == 0 changed_when: uninstall.rc == 0
#- name: Remove IPA server packages #- name: Remove IPA server packages
# package: # ansible.builtin.package:
# name: "{{ ipaserver_packages }}" # name: "{{ ipaserver_packages }}"
# state: absent # state: absent
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment