From 99c7acbe5ffe817f22e0094f45a3fd0f6715b05b Mon Sep 17 00:00:00 2001 From: Thomas Woerner <twoerner@redhat.com> Date: Tue, 20 Dec 2022 13:40:09 +0100 Subject: [PATCH] automember: 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 --- tests/automember/test_automember_client_context.yml | 6 +++--- tests/automember/test_automember_orphans_removed.yml | 2 +- tests/automember/test_automember_rebuilt.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/automember/test_automember_client_context.yml b/tests/automember/test_automember_client_context.yml index 5e03302c..b796a065 100644 --- a/tests/automember/test_automember_client_context.yml +++ b/tests/automember/test_automember_client_context.yml @@ -6,7 +6,7 @@ tasks: - 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. - name: Execute with server context in the client. @@ -28,13 +28,13 @@ # in upstream CI. - name: Test automember using client context, in client host. - import_playbook: test_automember.yml + ansible.builtin.import_playbook: test_automember.yml when: groups['ipaclients'] vars: ipa_test_host: ipaclients - name: Test automember using client context, in server host. - import_playbook: test_automember.yml + ansible.builtin.import_playbook: test_automember.yml when: groups['ipaclients'] is not defined or not groups['ipaclients'] vars: ipa_context: client diff --git a/tests/automember/test_automember_orphans_removed.yml b/tests/automember/test_automember_orphans_removed.yml index 0b9bcd3a..697f78d4 100644 --- a/tests/automember/test_automember_orphans_removed.yml +++ b/tests/automember/test_automember_orphans_removed.yml @@ -8,7 +8,7 @@ # SET FACTS - name: Get Domain from server name - set_fact: + ansible.builtin.set_fact: ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}" when: ipaserver_domain is not defined diff --git a/tests/automember/test_automember_rebuilt.yml b/tests/automember/test_automember_rebuilt.yml index 4458e202..34b981b7 100644 --- a/tests/automember/test_automember_rebuilt.yml +++ b/tests/automember/test_automember_rebuilt.yml @@ -8,7 +8,7 @@ # SET FACTS - name: Get Domain from server name - set_fact: + ansible.builtin.set_fact: ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}" when: ipaserver_domain is not defined -- GitLab