From 84c0188023c61489cf937d7d7faf6c8289669693 Mon Sep 17 00:00:00 2001 From: Thomas Woerner <twoerner@redhat.com> Date: Tue, 20 Dec 2022 13:43:59 +0100 Subject: [PATCH] tests/ca-less: 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/ca-less/clean_up_certificates.yml | 2 +- tests/ca-less/install_replica_without_ca.yml | 12 ++++++------ tests/ca-less/install_server_without_ca.yml | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/ca-less/clean_up_certificates.yml b/tests/ca-less/clean_up_certificates.yml index 23c025b3..2f499dc5 100644 --- a/tests/ca-less/clean_up_certificates.yml +++ b/tests/ca-less/clean_up_certificates.yml @@ -5,7 +5,7 @@ tasks: - name: Run generate-certificates.sh - command: > + ansible.builtin.command: > /bin/bash generate-certificates.sh delete "{{ item }}" args: diff --git a/tests/ca-less/install_replica_without_ca.yml b/tests/ca-less/install_replica_without_ca.yml index dc026220..67608312 100644 --- a/tests/ca-less/install_replica_without_ca.yml +++ b/tests/ca-less/install_replica_without_ca.yml @@ -5,7 +5,7 @@ tasks: - name: Run generate-certificates.sh - command: > + ansible.builtin.command: > /bin/bash generate-certificates.sh create "{{ groups.ipareplicas[0] }}" @@ -40,18 +40,18 @@ pre_tasks: - name: Remove "/root/ca-less-test" - file: + ansible.builtin.file: path: "/root/ca-less-test" state: absent - name: Generate "/root/ca-less-test" - file: + ansible.builtin.file: path: "/root/ca-less-test" state: directory mode: 0775 - name: Copy CA certificate - copy: + ansible.builtin.copy: src: "{{ playbook_dir }}/certificates/root-ca/cert.pem" dest: "/root/ca-less-test/ca.crt" owner: root @@ -59,7 +59,7 @@ mode: "0644" - name: Copy p12 certificates - copy: + ansible.builtin.copy: src: "{{ playbook_dir }}/certificates/{{ item }}/{{ groups.ipareplicas[0] }}/cert.p12" dest: "/root/ca-less-test/{{ item }}.p12" owner: root @@ -76,7 +76,7 @@ post_tasks: - name: Fix KDC certificate permissions - file: + ansible.builtin.file: path: /var/kerberos/krb5kdc/kdc.crt owner: root group: root diff --git a/tests/ca-less/install_server_without_ca.yml b/tests/ca-less/install_server_without_ca.yml index add0f622..a29cb0c2 100644 --- a/tests/ca-less/install_server_without_ca.yml +++ b/tests/ca-less/install_server_without_ca.yml @@ -5,7 +5,7 @@ tasks: - name: Run generate-certificates.sh - command: > + ansible.builtin.command: > /bin/bash generate-certificates.sh create "{{ groups.ipaserver[0] }}" @@ -40,18 +40,18 @@ pre_tasks: - name: Remove "/root/ca-less-test" - file: + ansible.builtin.file: path: "/root/ca-less-test" state: absent - name: Generate "/root/ca-less-test" - file: + ansible.builtin.file: path: "/root/ca-less-test" state: directory mode: 0775 - name: Copy CA certificate - copy: + ansible.builtin.copy: src: "{{ playbook_dir }}/certificates/root-ca/cert.pem" dest: "/root/ca-less-test/ca.crt" owner: root @@ -59,7 +59,7 @@ mode: "0644" - name: Copy p12 certificates - copy: + ansible.builtin.copy: src: "{{ playbook_dir }}/certificates/{{ item }}/{{ groups.ipaserver[0] }}/cert.p12" dest: "/root/ca-less-test/{{ item }}.p12" owner: root -- GitLab