From 731139431620ac6f8c7a52aa756a24ea36ec7742 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sun, 17 Oct 2021 18:26:08 +0200 Subject: [PATCH] [stable-1] Fix wrong FQCNs (#3576) * Use correct FQCN. (#3573) (cherry picked from commit c3813d4533bcdcb508b43329f0301e754aa2fd92) * Add more fixes. --- tests/integration/targets/consul/tasks/main.yml | 2 +- .../integration/targets/docker_swarm/tasks/tests/options-ca.yml | 2 +- .../lookup_hashi_vault/lookup_hashi_vault/tasks/main.yml | 2 +- tests/integration/targets/nomad/tasks/main.yml | 2 +- .../targets/setup_docker_registry/tasks/setup-frontend.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/integration/targets/consul/tasks/main.yml b/tests/integration/targets/consul/tasks/main.yml index 4de2d332e5..b8a8d32d34 100644 --- a/tests/integration/targets/consul/tasks/main.yml +++ b/tests/integration/targets/consul/tasks/main.yml @@ -36,7 +36,7 @@ commonName: localhost - name: Generate selfsigned certificate register: selfsigned_certificate - community.crypto.openssl_certificate: + community.crypto.x509_certificate: path: '{{ output_dir }}/cert.pem' csr_path: '{{ output_dir }}/csr.csr' privatekey_path: '{{ output_dir }}/privatekey.pem' diff --git a/tests/integration/targets/docker_swarm/tasks/tests/options-ca.yml b/tests/integration/targets/docker_swarm/tasks/tests/options-ca.yml index 6f9f10903d..2efbff4c2f 100644 --- a/tests/integration/targets/docker_swarm/tasks/tests/options-ca.yml +++ b/tests/integration/targets/docker_swarm/tasks/tests/options-ca.yml @@ -32,7 +32,7 @@ - key2 loop_control: loop_var: key - community.crypto.openssl_certificate: + community.crypto.x509_certificate: path: '{{ output_dir }}/ansible_{{ key }}.pem' privatekey_path: '{{ output_dir }}/ansible_{{ key }}.key' csr_path: '{{ output_dir }}/ansible_{{ key }}.csr' diff --git a/tests/integration/targets/lookup_hashi_vault/lookup_hashi_vault/tasks/main.yml b/tests/integration/targets/lookup_hashi_vault/lookup_hashi_vault/tasks/main.yml index 9d0eee1885..20a0d035f1 100644 --- a/tests/integration/targets/lookup_hashi_vault/lookup_hashi_vault/tasks/main.yml +++ b/tests/integration/targets/lookup_hashi_vault/lookup_hashi_vault/tasks/main.yml @@ -32,7 +32,7 @@ commonName: localhost - name: Generate selfsigned certificate - community.crypto.openssl_certificate: + community.crypto.x509_certificate: path: '{{ local_temp_dir }}/cert.pem' csr_path: '{{ local_temp_dir }}/csr.csr' privatekey_path: '{{ local_temp_dir }}/privatekey.pem' diff --git a/tests/integration/targets/nomad/tasks/main.yml b/tests/integration/targets/nomad/tasks/main.yml index 1e42e7b2f6..e5ac19cb69 100644 --- a/tests/integration/targets/nomad/tasks/main.yml +++ b/tests/integration/targets/nomad/tasks/main.yml @@ -47,7 +47,7 @@ - name: Generate selfsigned certificate register: selfsigned_certificate - community.crypto.openssl_certificate: + community.crypto.x509_certificate: path: '{{ output_dir }}/cert.pem' csr_path: '{{ output_dir }}/csr.csr' privatekey_path: '{{ output_dir }}/privatekey.pem' diff --git a/tests/integration/targets/setup_docker_registry/tasks/setup-frontend.yml b/tests/integration/targets/setup_docker_registry/tasks/setup-frontend.yml index f1055ea3d3..778cd47302 100644 --- a/tests/integration/targets/setup_docker_registry/tasks/setup-frontend.yml +++ b/tests/integration/targets/setup_docker_registry/tasks/setup-frontend.yml @@ -51,7 +51,7 @@ - DNS:test-registry.ansible.com - name: Create frontend certificate - community.crypto.openssl_certificate: + community.crypto.x509_certificate: path: '{{ output_dir }}/cert.pem' csr_path: '{{ output_dir }}/cert.csr' privatekey_path: '{{ output_dir }}/cert.key'