From 470d0ddc1bb7fd2e282f5eb23b283159f8a4c154 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Tue, 20 Dec 2022 13:46:54 +0100
Subject: [PATCH] dnszone: 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/dnszone/dnszone-reverse-from-ip.yml | 2 +-
tests/dnszone/env_setup.yml | 2 +-
tests/dnszone/env_teardown.yml | 2 +-
tests/dnszone/test_dnszone.yml | 4 ++--
tests/dnszone/test_dnszone_client_context.yml | 6 +++---
tests/dnszone/test_dnszone_mod.yml | 4 ++--
tests/dnszone/test_dnszone_name_from_ip.yml | 6 +++---
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/playbooks/dnszone/dnszone-reverse-from-ip.yml b/playbooks/dnszone/dnszone-reverse-from-ip.yml
index 218a3189..a8259c9b 100644
--- a/playbooks/dnszone/dnszone-reverse-from-ip.yml
+++ b/playbooks/dnszone/dnszone-reverse-from-ip.yml
@@ -11,5 +11,5 @@
register: result
- name: Zone name inferred from `name_from_ip`
- debug:
+ ansible.builtin.debug:
msg: "Zone created: {{ result.dnszone.name }}"
diff --git a/tests/dnszone/env_setup.yml b/tests/dnszone/env_setup.yml
index ce437811..1518c506 100644
--- a/tests/dnszone/env_setup.yml
+++ b/tests/dnszone/env_setup.yml
@@ -1,3 +1,3 @@
---
- name: Cleanup test environment.
- include_tasks: env_cleanup.yml
+ ansible.builtin.include_tasks: env_cleanup.yml
diff --git a/tests/dnszone/env_teardown.yml b/tests/dnszone/env_teardown.yml
index ce437811..1518c506 100644
--- a/tests/dnszone/env_teardown.yml
+++ b/tests/dnszone/env_teardown.yml
@@ -1,3 +1,3 @@
---
- name: Cleanup test environment.
- include_tasks: env_cleanup.yml
+ ansible.builtin.include_tasks: env_cleanup.yml
diff --git a/tests/dnszone/test_dnszone.yml b/tests/dnszone/test_dnszone.yml
index b7e01d4c..ef0f2d23 100644
--- a/tests/dnszone/test_dnszone.yml
+++ b/tests/dnszone/test_dnszone.yml
@@ -8,7 +8,7 @@
# Setup
- name: Setup testing environment
- include_tasks: env_setup.yml
+ ansible.builtin.include_tasks: env_setup.yml
# Tests
- name: Check if zone is present, when in shouldn't be.
@@ -267,4 +267,4 @@
# Teardown
- name: Teardown testing environment
- include_tasks: env_teardown.yml
+ ansible.builtin.include_tasks: env_teardown.yml
diff --git a/tests/dnszone/test_dnszone_client_context.yml b/tests/dnszone/test_dnszone_client_context.yml
index 79a00ff1..a2cf652b 100644
--- a/tests/dnszone/test_dnszone_client_context.yml
+++ b/tests/dnszone/test_dnszone_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 dnszone using client context, in client host.
- import_playbook: test_dnszone.yml
+ ansible.builtin.import_playbook: test_dnszone.yml
when: groups['ipaclients']
vars:
ipa_test_host: ipaclients
- name: Test dnszone using client context, in server host.
- import_playbook: test_dnszone.yml
+ ansible.builtin.import_playbook: test_dnszone.yml
when: groups['ipaclients'] is not defined or not groups['ipaclients']
vars:
ipa_context: client
diff --git a/tests/dnszone/test_dnszone_mod.yml b/tests/dnszone/test_dnszone_mod.yml
index 5bb33d68..5dbbe9e3 100644
--- a/tests/dnszone/test_dnszone_mod.yml
+++ b/tests/dnszone/test_dnszone_mod.yml
@@ -8,7 +8,7 @@
# Setup
- name: Setup testing environment
- include_tasks: env_setup.yml
+ ansible.builtin.include_tasks: env_setup.yml
- name: Ensure zone is present.
ipadnszone:
@@ -291,4 +291,4 @@
# Teardown
- name: Teardown testing environment
- include_tasks: env_teardown.yml
+ ansible.builtin.include_tasks: env_teardown.yml
diff --git a/tests/dnszone/test_dnszone_name_from_ip.yml b/tests/dnszone/test_dnszone_name_from_ip.yml
index 62295742..53afe23b 100644
--- a/tests/dnszone/test_dnszone_name_from_ip.yml
+++ b/tests/dnszone/test_dnszone_name_from_ip.yml
@@ -8,7 +8,7 @@
# Setup
- name: Setup testing environment
- include_tasks: env_setup.yml
+ ansible.builtin.include_tasks: env_setup.yml
# Tests
- name: Ensure zone exists for reverse IP.
@@ -55,7 +55,7 @@
register: ipv6_zone
failed_when: not ipv6_zone.changed or ipv6_zone.failed
- # - debug:
+ # - ansible.builtin.debug:
# msg: "{{ipv6_zone}}"
- name: Ensure ipv6 zone was created.
@@ -95,4 +95,4 @@
# Teardown
- name: Teardown testing environment
- include_tasks: env_teardown.yml
+ ansible.builtin.include_tasks: env_teardown.yml
--
GitLab