From e852164d48849c2a385cea31129af01dd4b28b11 Mon Sep 17 00:00:00 2001 From: Daniel Hagan Date: Wed, 3 Apr 2019 14:38:28 -0400 Subject: [PATCH] correct openssl rsa to genrsa in acme doc fragment (#54744) * correct openssl rsa to genrsa in acme doc fragment * acme_certificate.py - updated route53 example to include wait: yes (cherry picked from commit c11af3dbef98a69b4c6f8a23649631c463a8a430) --- lib/ansible/modules/crypto/acme/acme_certificate.py | 2 ++ lib/ansible/utils/module_docs_fragments/acme.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/ansible/modules/crypto/acme/acme_certificate.py b/lib/ansible/modules/crypto/acme/acme_certificate.py index d5b1b9933e6..04a1c940f32 100644 --- a/lib/ansible/modules/crypto/acme/acme_certificate.py +++ b/lib/ansible/modules/crypto/acme/acme_certificate.py @@ -234,6 +234,7 @@ EXAMPLES = R''' # type: TXT # ttl: 60 # state: present +# wait: yes # # Note: route53 requires TXT entries to be enclosed in quotes # value: "{{ sample_com_challenge.challenge_data['sample.com']['dns-01'].resource_value | regex_replace('^(.*)$', '\"\\1\"') }}" # when: sample_com_challenge is changed @@ -246,6 +247,7 @@ EXAMPLES = R''' # type: TXT # ttl: 60 # state: present +# wait: yes # # Note: item.value is a list of TXT entries, and route53 # # requires every entry to be enclosed in quotes # value: "{{ item.value | map('regex_replace', '^(.*)$', '\"\\1\"' ) | list }}" diff --git a/lib/ansible/utils/module_docs_fragments/acme.py b/lib/ansible/utils/module_docs_fragments/acme.py index c058435b576..675d073a302 100644 --- a/lib/ansible/utils/module_docs_fragments/acme.py +++ b/lib/ansible/utils/module_docs_fragments/acme.py @@ -28,7 +28,7 @@ options: description: - "Path to a file containing the ACME account RSA or Elliptic Curve key." - - "RSA keys can be created with C(openssl rsa ...). Elliptic curve keys can + - "RSA keys can be created with C(openssl genrsa ...). Elliptic curve keys can be created with C(openssl ecparam -genkey ...). Any other tool creating private keys in PEM format can be used as well." - "Mutually exclusive with C(account_key_content)."