From ad768f2ff1cb6c86ebee81ff3f38568c7c8d0cc2 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sat, 28 Oct 2023 22:22:45 +0200 Subject: [PATCH] Use FQCNs in examples. --- plugins/modules/acme_certificate.py | 3 ++- plugins/modules/certificate_complete_chain.py | 4 ++-- plugins/modules/openssl_csr_pipe.py | 2 +- plugins/modules/x509_certificate_pipe.py | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/plugins/modules/acme_certificate.py b/plugins/modules/acme_certificate.py index b0a975a75..9c0b349c4 100644 --- a/plugins/modules/acme_certificate.py +++ b/plugins/modules/acme_certificate.py @@ -307,7 +307,8 @@ # Alternative first step: - name: Create a challenge for sample.com using a account key from Hashi Vault. community.crypto.acme_certificate: - account_key_content: "{{ lookup('hashi_vault', 'secret=secret/account_private_key:value') }}" + account_key_content: >- + {{ lookup('community.hashi_vault.hashi_vault', 'secret=secret/account_private_key:value') }} csr: /etc/pki/cert/csr/sample.com.csr fullchain_dest: /etc/httpd/ssl/sample.com-fullchain.crt register: sample_com_challenge diff --git a/plugins/modules/certificate_complete_chain.py b/plugins/modules/certificate_complete_chain.py index b1862d2ce..357d2f668 100644 --- a/plugins/modules/certificate_complete_chain.py +++ b/plugins/modules/certificate_complete_chain.py @@ -78,7 +78,7 @@ # certificates, finds the associated root certificate. - name: Find root certificate community.crypto.certificate_complete_chain: - input_chain: "{{ lookup('file', '/etc/ssl/csr/www.ansible.com-fullchain.pem') }}" + input_chain: "{{ lookup('ansible.builtin.file', '/etc/ssl/csr/www.ansible.com-fullchain.pem') }}" root_certificates: - /etc/ca-certificates/ register: www_ansible_com @@ -91,7 +91,7 @@ # certificates, finds the associated root certificate. - name: Find root certificate community.crypto.certificate_complete_chain: - input_chain: "{{ lookup('file', '/etc/ssl/csr/www.ansible.com.pem') }}" + input_chain: "{{ lookup('ansible.builtin.file', '/etc/ssl/csr/www.ansible.com.pem') }}" intermediate_certificates: - /etc/ssl/csr/www.ansible.com-chain.pem root_certificates: diff --git a/plugins/modules/openssl_csr_pipe.py b/plugins/modules/openssl_csr_pipe.py index a826dd545..2e591e8fb 100644 --- a/plugins/modules/openssl_csr_pipe.py +++ b/plugins/modules/openssl_csr_pipe.py @@ -58,7 +58,7 @@ - name: Generate an OpenSSL Certificate Signing Request with an inline CSR community.crypto.openssl_csr: - content: "{{ lookup('file', '/etc/ssl/csr/www.ansible.com.csr') }}" + content: "{{ lookup('ansible.builtin.file', '/etc/ssl/csr/www.ansible.com.csr') }}" privatekey_content: "{{ private_key_content }}" common_name: www.ansible.com register: result diff --git a/plugins/modules/x509_certificate_pipe.py b/plugins/modules/x509_certificate_pipe.py index b08630bd3..2eaead47c 100644 --- a/plugins/modules/x509_certificate_pipe.py +++ b/plugins/modules/x509_certificate_pipe.py @@ -71,8 +71,8 @@ - name: (1/2) Generate an OpenSSL Certificate with the CSR provided inline community.crypto.x509_certificate_pipe: provider: ownca - content: "{{ lookup('file', '/etc/ssl/csr/www.ansible.com.crt') }}" - csr_content: "{{ lookup('file', '/etc/ssl/csr/www.ansible.com.csr') }}" + content: "{{ lookup('ansible.builtin.file', '/etc/ssl/csr/www.ansible.com.crt') }}" + csr_content: "{{ lookup('ansible.builtin.file', '/etc/ssl/csr/www.ansible.com.csr') }}" ownca_cert: /path/to/ca_cert.crt ownca_privatekey: /path/to/ca_cert.key ownca_privatekey_passphrase: hunter2