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

idrange: 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 473ed03e
Branches
Tags
No related merge requests found
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
failed_when: result.failed failed_when: result.failed
- name: Retrieve Domain Security Identifier - name: Retrieve Domain Security Identifier
shell: ansible.builtin.shell:
cmd: | cmd: |
kinit -c test_krb5_cache admin <<< SomeADMINpassword > /dev/null kinit -c test_krb5_cache admin <<< SomeADMINpassword > /dev/null
KRB5CCNAME=test_krb5_cache ipa trust-show {{ adserver.domain }} | sed -n "/Domain Security Identifier/s/ //gp" | cut -d":" -f2 KRB5CCNAME=test_krb5_cache ipa trust-show {{ adserver.domain }} | sed -n "/Domain Security Identifier/s/ //gp" | cut -d":" -f2
...@@ -32,5 +32,5 @@ ...@@ -32,5 +32,5 @@
no_log: yes no_log: yes
- name: Set ipa_domain_sid. - name: Set ipa_domain_sid.
set_fact: ansible.builtin.set_fact:
ipa_domain_sid: "{{ getsid.stdout }}" ipa_domain_sid: "{{ getsid.stdout }}"
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
tasks: tasks:
# CLEANUP TEST ITEMS # CLEANUP TEST ITEMS
- name: Remove test trust. - name: Remove test trust.
include_tasks: tasks_remove_trust.yml ansible.builtin.include_tasks: tasks_remove_trust.yml
when: trust_test_is_supported | default(false) when: trust_test_is_supported | default(false)
- name: Ensure testing idranges are absent - name: Ensure testing idranges are absent
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
- block: - block:
# Create trust with range_type: ipa-ad-trust # Create trust with range_type: ipa-ad-trust
- name: Create trust with range_type 'ipa-ad-trust' - name: Create trust with range_type 'ipa-ad-trust'
include_tasks: tasks_set_trust.yml ansible.builtin.include_tasks: tasks_set_trust.yml
vars: vars:
trust_base_id: 10000000 trust_base_id: 10000000
trust_range_size: 200000 trust_range_size: 200000
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
# Remove trust and idrange # Remove trust and idrange
- name: Remove test trust. - name: Remove test trust.
include_tasks: tasks_remove_trust.yml ansible.builtin.include_tasks: tasks_remove_trust.yml
- name: Ensure AD-trust idrange is absent - name: Ensure AD-trust idrange is absent
ipaidrange: ipaidrange:
...@@ -229,7 +229,7 @@ ...@@ -229,7 +229,7 @@
# Create trust with range_type: ipa-ad-trust-posix # Create trust with range_type: ipa-ad-trust-posix
- name: Create trust with range_type 'ipa-ad-trust' - name: Create trust with range_type 'ipa-ad-trust'
include_tasks: tasks_set_trust.yml ansible.builtin.include_tasks: tasks_set_trust.yml
vars: vars:
trust_base_id: 10000000 trust_base_id: 10000000
trust_range_size: 200000 trust_range_size: 200000
...@@ -251,7 +251,7 @@ ...@@ -251,7 +251,7 @@
# Remove trust and idrange # Remove trust and idrange
- name: Remove test trust. - name: Remove test trust.
include_tasks: tasks_remove_trust.yml ansible.builtin.include_tasks: tasks_remove_trust.yml
- name: Ensure AD-trust idrange is absent - name: Ensure AD-trust idrange is absent
ipaidrange: ipaidrange:
...@@ -262,7 +262,7 @@ ...@@ -262,7 +262,7 @@
# Remove trust and idrange # Remove trust and idrange
- name: Remove test trust. - name: Remove test trust.
include_tasks: tasks_remove_trust.yml ansible.builtin.include_tasks: tasks_remove_trust.yml
- name: Ensure AD-trust idrange is absent - name: Ensure AD-trust idrange is absent
ipaidrange: ipaidrange:
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
# Create trust with range_type: ipa-ad-trust-posix # Create trust with range_type: ipa-ad-trust-posix
- name: Create trust with range_type 'ipa-ad-trust-posix' - name: Create trust with range_type 'ipa-ad-trust-posix'
include_tasks: tasks_set_trust.yml ansible.builtin.include_tasks: tasks_set_trust.yml
vars: vars:
trust_base_id: 10000000 trust_base_id: 10000000
trust_range_size: 2000000 trust_range_size: 2000000
...@@ -319,7 +319,7 @@ ...@@ -319,7 +319,7 @@
# Remove trust and idrange # Remove trust and idrange
- name: Remove test trust. - name: Remove test trust.
include_tasks: tasks_remove_trust.yml ansible.builtin.include_tasks: tasks_remove_trust.yml
- name: Ensure AD-trust idrange is absent - name: Ensure AD-trust idrange is absent
ipaidrange: ipaidrange:
...@@ -330,7 +330,7 @@ ...@@ -330,7 +330,7 @@
# Create trust with range_type: ipa-ad-trust-posix # Create trust with range_type: ipa-ad-trust-posix
- name: Create trust with range_type 'ipa-ad-trust-posix' - name: Create trust with range_type 'ipa-ad-trust-posix'
include_tasks: tasks_set_trust.yml ansible.builtin.include_tasks: tasks_set_trust.yml
vars: vars:
trust_base_id: 10000000 trust_base_id: 10000000
trust_range_size: 2000000 trust_range_size: 2000000
...@@ -352,7 +352,7 @@ ...@@ -352,7 +352,7 @@
always: always:
# CLEANUP TEST ITEMS # CLEANUP TEST ITEMS
- name: Remove test trust. - name: Remove test trust.
include_tasks: tasks_remove_trust.yml ansible.builtin.include_tasks: tasks_remove_trust.yml
- name: Ensure testing idranges are absent - name: Ensure testing idranges are absent
ipaidrange: ipaidrange:
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
tasks: tasks:
- name: Include FreeIPA facts. - name: Include FreeIPA facts.
include_tasks: ../env_freeipa_facts.yml ansible.builtin.include_tasks: ../env_freeipa_facts.yml
# Test will only be executed if host is not a server. # Test will only be executed if host is not a server.
- name: Execute with server context in the client. - name: Execute with server context in the client.
...@@ -29,11 +29,11 @@ ...@@ -29,11 +29,11 @@
# in upstream CI. # in upstream CI.
- name: Test idrange using client context, in client host. - name: Test idrange using client context, in client host.
import_playbook: test_idrange.yml ansible.builtin.import_playbook: test_idrange.yml
when: groups['ipaclients'] when: groups['ipaclients']
vars: vars:
ipa_test_host: ipaclients ipa_test_host: ipaclients
- name: Test idrange using client context, in server host. - name: Test idrange using client context, in server host.
import_playbook: test_idrange.yml ansible.builtin.import_playbook: test_idrange.yml
when: groups['ipaclients'] is not defined or not groups['ipaclients'] when: groups['ipaclients'] is not defined or not groups['ipaclients']
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment