From f2a0edeb25af1ec59ed8d4df6b31bfb513ba4171 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Tue, 20 Dec 2022 13:52:36 +0100
Subject: [PATCH] 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
---
tests/role/env_facts.yml | 8 +++----
tests/role/env_setup.yml | 2 +-
tests/role/test_role.yml | 6 ++---
tests/role/test_role_client_context.yml | 6 ++---
tests/role/test_role_lists_handling.yml | 22 +++++++++----------
.../test_role_member_case_insensitive.yml | 2 +-
tests/role/test_role_service_member.yml | 6 ++---
7 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/tests/role/env_facts.yml b/tests/role/env_facts.yml
index dbc16a96..30341839 100644
--- a/tests/role/env_facts.yml
+++ b/tests/role/env_facts.yml
@@ -1,21 +1,21 @@
---
- block:
- name: Get Domain from server name
- set_fact:
+ ansible.builtin.set_fact:
ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
when: "'fqdn' in ansible_facts"
- name: Set Domain to 'ipa.test' if FQDN could not be retrieved.
- set_fact:
+ ansible.builtin.set_fact:
ipaserver_domain: "ipa.test"
when: "'fqdn' not in ansible_facts"
when: ipaserver_domain is not defined
- name: Set ipaserver_realm.
- set_fact:
+ ansible.builtin.set_fact:
ipaserver_realm: "{{ ipaserver_domain | upper }}"
when: ipaserver_realm is not defined
- name: Create FQDN for host01
- set_fact:
+ ansible.builtin.set_fact:
host1_fqdn: "host01.{{ ipaserver_domain }}"
host2_fqdn: "host02.{{ ipaserver_domain }}"
diff --git a/tests/role/env_setup.yml b/tests/role/env_setup.yml
index eb72c82b..6a24839e 100644
--- a/tests/role/env_setup.yml
+++ b/tests/role/env_setup.yml
@@ -1,6 +1,6 @@
---
- name: Cleanup environment.
- import_tasks: env_cleanup.yml
+ ansible.builtin.import_tasks: env_cleanup.yml
- name: Ensure test user is present.
ipauser:
diff --git a/tests/role/test_role.yml b/tests/role/test_role.yml
index 5c4f81b9..884cbcd3 100644
--- a/tests/role/test_role.yml
+++ b/tests/role/test_role.yml
@@ -6,10 +6,10 @@
tasks:
- name: Set environment facts.
- import_tasks: env_facts.yml
+ ansible.builtin.import_tasks: env_facts.yml
- name: Setup environment.
- import_tasks: env_setup.yml
+ ansible.builtin.import_tasks: env_setup.yml
# tests
- name: Ensure role is present.
@@ -424,4 +424,4 @@
# cleanup
- name: Cleanup environment.
- include_tasks: env_cleanup.yml
+ ansible.builtin.include_tasks: env_cleanup.yml
diff --git a/tests/role/test_role_client_context.yml b/tests/role/test_role_client_context.yml
index cb1bbba8..3a87a2cc 100644
--- a/tests/role/test_role_client_context.yml
+++ b/tests/role/test_role_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.
@@ -27,13 +27,13 @@
# in upstream CI.
- name: Test role using client context, in client host.
- import_playbook: test_role.yml
+ ansible.builtin.import_playbook: test_role.yml
when: groups['ipaclients']
vars:
ipa_test_host: ipaclients
- name: Test role using client context, in server host.
- import_playbook: test_role.yml
+ ansible.builtin.import_playbook: test_role.yml
when: groups['ipaclients'] is not defined or not groups['ipaclients']
vars:
ipa_context: client
diff --git a/tests/role/test_role_lists_handling.yml b/tests/role/test_role_lists_handling.yml
index ca3f023c..f8911ac4 100644
--- a/tests/role/test_role_lists_handling.yml
+++ b/tests/role/test_role_lists_handling.yml
@@ -6,10 +6,10 @@
tasks:
- name: Set environment facts.
- import_tasks: env_facts.yml
+ ansible.builtin.import_tasks: env_facts.yml
- name: Setup environment.
- import_tasks: env_setup.yml
+ ansible.builtin.import_tasks: env_setup.yml
- name: Add role.
iparole:
@@ -41,7 +41,7 @@
failed_when: result.failed or not result.changed
- name: Verify role privileges.
- shell:
+ ansible.builtin.shell:
cmd: |
echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin
KRB5CCNAME={{ krb5ccname }} ipa role-show testrole
@@ -71,7 +71,7 @@
failed_when: result.failed or not result.changed
- name: Verify role users.
- shell:
+ ansible.builtin.shell:
cmd: |
echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin
KRB5CCNAME={{ krb5ccname }} ipa role-show testrole
@@ -95,7 +95,7 @@
failed_when: result.failed or not result.changed
- name: Verify role group.
- shell:
+ ansible.builtin.shell:
cmd: |
echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin
KRB5CCNAME={{ krb5ccname }} ipa role-show testrole
@@ -119,7 +119,7 @@
failed_when: result.failed or not result.changed
- name: Verify role hosts.
- shell:
+ ansible.builtin.shell:
cmd: |
echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin
KRB5CCNAME={{ krb5ccname }} ipa role-show testrole
@@ -145,7 +145,7 @@
failed_when: result.failed or not result.changed
- name: Verify role hostgroups.
- shell:
+ ansible.builtin.shell:
cmd: |
echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin
KRB5CCNAME={{ krb5ccname }} ipa role-show testrole
@@ -169,7 +169,7 @@
failed_when: result.failed or not result.changed
- name: Verify role services.
- shell:
+ ansible.builtin.shell:
cmd: |
echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin
KRB5CCNAME={{ krb5ccname }} ipa role-show testrole
@@ -197,7 +197,7 @@
failed_when: result.failed or not result.changed
- name: Verify role services.
- shell:
+ ansible.builtin.shell:
cmd: |
echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin
KRB5CCNAME={{ krb5ccname }} ipa role-show testrole
@@ -225,7 +225,7 @@
failed_when: result.failed or not result.changed
- name: Verify role services.
- shell:
+ ansible.builtin.shell:
cmd: |
echo SomeADMINpassword | kinit -c {{ krb5ccname }} admin
KRB5CCNAME={{ krb5ccname }} ipa role-show testrole
@@ -256,4 +256,4 @@
# cleanup
- name: Cleanup environment.
- include_tasks: env_cleanup.yml
+ ansible.builtin.include_tasks: env_cleanup.yml
diff --git a/tests/role/test_role_member_case_insensitive.yml b/tests/role/test_role_member_case_insensitive.yml
index 3f386fc3..d5d5a6c6 100644
--- a/tests/role/test_role_member_case_insensitive.yml
+++ b/tests/role/test_role_member_case_insensitive.yml
@@ -22,7 +22,7 @@
- MySVC/host01
tasks:
- - include_tasks: ../env_freeipa_facts.yml
+ - ansible.builtin.include_tasks: ../env_freeipa_facts.yml
- block:
# setup
diff --git a/tests/role/test_role_service_member.yml b/tests/role/test_role_service_member.yml
index 307dc94f..13fa083e 100644
--- a/tests/role/test_role_service_member.yml
+++ b/tests/role/test_role_service_member.yml
@@ -6,10 +6,10 @@
tasks:
- name: Set environment facts.
- import_tasks: env_facts.yml
+ ansible.builtin.import_tasks: env_facts.yml
- name: Setup environment.
- import_tasks: env_setup.yml
+ ansible.builtin.import_tasks: env_setup.yml
# tests
@@ -92,4 +92,4 @@
# cleanup
- name: Cleanup environment.
- include_tasks: env_cleanup.yml
+ ansible.builtin.include_tasks: env_cleanup.yml
--
GitLab