From d204b6d480440613fa3239c0db49422c16daaaba Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Tue, 20 Dec 2022 13:53:30 +0100
Subject: [PATCH] server: 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/server/test_server.yml | 8 ++++----
tests/server/test_server_client_context.yml | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/server/test_server.yml b/tests/server/test_server.yml
index 0216cd8c..c27da846 100644
--- a/tests/server/test_server.yml
+++ b/tests/server/test_server.yml
@@ -9,21 +9,21 @@
# CLEANUP TEST ITEMS
- block:
- name: Get server name from hostname
- set_fact:
+ ansible.builtin.set_fact:
ipa_server_name: "{{ ansible_facts['fqdn'].split('.')[0] }}"
rescue:
- name: Fallback to 'ipaserver'
- set_fact:
+ ansible.builtin.set_fact:
ipa_server_name: ipaserver
when: ipa_server_name is not defined
- block:
- name: Get domain name from hostname.
- set_fact:
+ ansible.builtin.set_fact:
ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join('.') }}"
rescue:
- name: Fallback to 'ipa.test'
- set_fact:
+ ansible.builtin.set_fact:
ipaserver_domain: "ipa.test"
when: ipaserver_domain is not defined
diff --git a/tests/server/test_server_client_context.yml b/tests/server/test_server_client_context.yml
index be7d08f1..6b9b1ca9 100644
--- a/tests/server/test_server_client_context.yml
+++ b/tests/server/test_server_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 server using client context, in client host.
- import_playbook: test_server.yml
+ ansible.builtin.import_playbook: test_server.yml
when: groups['ipaclients']
vars:
ipa_test_host: ipaclients
- name: Test server using client context, in server host.
- import_playbook: test_server.yml
+ ansible.builtin.import_playbook: test_server.yml
when: groups['ipaclients'] is not defined or not groups['ipaclients']
vars:
ipa_context: client
--
GitLab