From 91edff3b21ade14d07f25e922601b7065433addc Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Tue, 20 Dec 2022 13:44:38 +0100
Subject: [PATCH] config: 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
---
playbooks/config/retrieve-config.yml | 2 +-
tests/config/test_config.yml | 6 +++---
tests/config/test_config_client_context.yml | 6 +++---
tests/config/test_config_sid.yml | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/playbooks/config/retrieve-config.yml b/playbooks/config/retrieve-config.yml
index 17563680..7e7633ff 100644
--- a/playbooks/config/retrieve-config.yml
+++ b/playbooks/config/retrieve-config.yml
@@ -11,5 +11,5 @@
register: serverconfig
- name: Display current configuration.
- debug:
+ ansible.builtin.debug:
msg: "{{ serverconfig }}"
diff --git a/tests/config/test_config.yml b/tests/config/test_config.yml
index cac579d4..a4a84103 100644
--- a/tests/config/test_config.yml
+++ b/tests/config/test_config.yml
@@ -5,7 +5,7 @@
gather_facts: false
tasks:
- - include_tasks: ../env_freeipa_facts.yml
+ - ansible.builtin.include_tasks: ../env_freeipa_facts.yml
- block:
# Retrieve current configuration.
@@ -16,7 +16,7 @@
register: previousconfig
- name: Display current configuration.
- debug:
+ ansible.builtin.debug:
var: previousconfig
# setup environment.
@@ -481,7 +481,7 @@
register: result
- name: "CA-Renewal server warning."
- debug:
+ ansible.builtin.debug:
msg: "Due to a test failure, IPA CA-Renewal Server might not be correctly be set. Check your configuration."
always:
diff --git a/tests/config/test_config_client_context.yml b/tests/config/test_config_client_context.yml
index 515f313b..6ac552fb 100644
--- a/tests/config/test_config_client_context.yml
+++ b/tests/config/test_config_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.
@@ -26,13 +26,13 @@
# in upstream CI.
- name: Test config using client context, in client host.
- import_playbook: test_config.yml
+ ansible.builtin.import_playbook: test_config.yml
when: groups['ipaclients']
vars:
ipa_test_host: ipaclients
- name: Test config using client context, in server host.
- import_playbook: test_config.yml
+ ansible.builtin.import_playbook: test_config.yml
when: groups['ipaclients'] is not defined or not groups['ipaclients']
vars:
ipa_context: client
diff --git a/tests/config/test_config_sid.yml b/tests/config/test_config_sid.yml
index d8d78f12..5f8a1ef0 100644
--- a/tests/config/test_config_sid.yml
+++ b/tests/config/test_config_sid.yml
@@ -7,7 +7,7 @@
tasks:
- name: Set FreeIPA facts.
- include_tasks: ../env_freeipa_facts.yml
+ ansible.builtin.include_tasks: ../env_freeipa_facts.yml
# GET CURRENT CONFIG
--
GitLab