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

trust: 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 9d47ffc2
No related branches found
No related tags found
No related merge requests found
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
state: absent state: absent
- name: Clear test idranges - name: Clear test idranges
shell: | ansible.builtin.shell: |
kinit -c test_krb5_cache admin <<< SomeADMINpassword kinit -c test_krb5_cache admin <<< SomeADMINpassword
ipa idrange-del {{ adserver.realm }}_id_range || true ipa idrange-del {{ adserver.realm }}_id_range || true
ipa idrange-del {{ ipaserver.realm }}_subid_range || true ipa idrange-del {{ ipaserver.realm }}_subid_range || true
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
failed_when: result.failed or not result.changed failed_when: result.failed or not result.changed
- name: check if 'ipa-ad-trust' trust exists - name: check if 'ipa-ad-trust' trust exists
shell: | ansible.builtin.shell: |
echo 'SomeADMINpassword' | kinit admin echo 'SomeADMINpassword' | kinit admin
ipa trust-find ipa trust-find
kdestroy -c test_krb5_cache -q -A kdestroy -c test_krb5_cache -q -A
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
failed_when: result.failed or not result.changed failed_when: result.failed or not result.changed
- name: Check if 'ipa-ad-trust' trust was removed - name: Check if 'ipa-ad-trust' trust was removed
shell: | ansible.builtin.shell: |
kinit -c test_krb5_cache admin <<< SomeADMINpassword kinit -c test_krb5_cache admin <<< SomeADMINpassword
ipa trust-find ipa trust-find
kdestroy -c test_krb5_cache -q -A kdestroy -c test_krb5_cache -q -A
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
failed_when: result.failed or result.changed failed_when: result.failed or result.changed
- name: Clear test idranges - name: Clear test idranges
shell: | ansible.builtin.shell: |
kinit -c test_krb5_cache admin <<< SomeADMINpassword kinit -c test_krb5_cache admin <<< SomeADMINpassword
ipa idrange-del {{ adserver.realm }}_id_range || true ipa idrange-del {{ adserver.realm }}_id_range || true
ipa idrange-del {{ ipaserver.realm }}_subid_range || true ipa idrange-del {{ ipaserver.realm }}_subid_range || true
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
failed_when: result.failed or not result.changed failed_when: result.failed or not result.changed
- name: Check if 'ipa-ad-trust-posix' trust exists - name: Check if 'ipa-ad-trust-posix' trust exists
shell: | ansible.builtin.shell: |
kinit -c test_krb5_cache admin <<< SomeADMINpassword kinit -c test_krb5_cache admin <<< SomeADMINpassword
ipa trust-find ipa trust-find
kdestroy -c test_krb5_cache -q -A kdestroy -c test_krb5_cache -q -A
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
failed_when: result.failed or not result.changed failed_when: result.failed or not result.changed
- name: Check if trust 'ipa-ad-trust-posix' was removed - name: Check if trust 'ipa-ad-trust-posix' was removed
shell: | ansible.builtin.shell: |
kinit -c test_krb5_cache admin <<< SomeADMINpassword kinit -c test_krb5_cache admin <<< SomeADMINpassword
ipa trust-find ipa trust-find
kdestroy -c test_krb5_cache -q -A kdestroy -c test_krb5_cache -q -A
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
failed_when: result.failed or result.changed failed_when: result.failed or result.changed
- name: Clear test idranges - name: Clear test idranges
shell: | ansible.builtin.shell: |
kinit -c test_krb5_cache admin <<< SomeADMINpassword kinit -c test_krb5_cache admin <<< SomeADMINpassword
ipa idrange-del {{ adserver.realm }}_id_range || true ipa idrange-del {{ adserver.realm }}_id_range || true
ipa idrange-del {{ ipaserver.realm }}_subid_range || true ipa idrange-del {{ ipaserver.realm }}_subid_range || true
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,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.
...@@ -27,13 +27,13 @@ ...@@ -27,13 +27,13 @@
# in upstream CI. # in upstream CI.
- name: Test trust using client context, in client host. - name: Test trust using client context, in client host.
import_playbook: test_trust.yml ansible.builtin.import_playbook: test_trust.yml
when: groups['ipaclients'] when: groups['ipaclients']
vars: vars:
ipa_test_host: ipaclients ipa_test_host: ipaclients
- name: Test trust using client context, in server host. - name: Test trust using client context, in server host.
import_playbook: test_trust.yml ansible.builtin.import_playbook: test_trust.yml
when: groups['ipaclients'] is not defined or not groups['ipaclients'] when: groups['ipaclients'] is not defined or not groups['ipaclients']
vars: vars:
ipa_context: client ipa_context: client
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment