From 6462a296805148f01c9ea496864d73a7c8bf8680 Mon Sep 17 00:00:00 2001 From: Rhys Campbell Date: Mon, 4 Mar 2024 06:27:57 +0100 Subject: [PATCH 1/3] Adds tlsUseSystemCA parameter, default True for now but should probably be false before released --- plugins/module_utils/mongodb_common.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/module_utils/mongodb_common.py b/plugins/module_utils/mongodb_common.py index 8c9f41b3e..7f1860be3 100644 --- a/plugins/module_utils/mongodb_common.py +++ b/plugins/module_utils/mongodb_common.py @@ -145,6 +145,7 @@ def mongodb_common_argument_spec(ssl_options=True): ssl_certfile=dict(type='str', default=None, aliases=['tlsCertificateKeyFile']), ssl_keyfile=dict(type='str', default=None, no_log=True), ssl_pem_passphrase=dict(type='str', default=None, no_log=True, aliases=['tlsCertificateKeyFilePassword']), + tls_user_system_ca=dict(type='bool', required=False, default=True, aliases=['tlsUseSystemCA']), auth_mechanism=dict(type='str', required=False, default=None, From b7af03710b6646c444215efdab17362343e8fbbf Mon Sep 17 00:00:00 2001 From: Rhys Campbell Date: Mon, 4 Mar 2024 06:35:59 +0100 Subject: [PATCH 2/3] Add documntation for parameter --- plugins/doc_fragments/ssl_options.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/doc_fragments/ssl_options.py b/plugins/doc_fragments/ssl_options.py index efd330b7d..012432806 100644 --- a/plugins/doc_fragments/ssl_options.py +++ b/plugins/doc_fragments/ssl_options.py @@ -58,6 +58,11 @@ class ModuleDocFragment(object): type: str aliases: - tlsCertificateKeyFilePassword + tls_user_system_ca: + description: + - Use the system-wide CA certificate store. + type: bool + default: false auth_mechanism: description: - Authentication type. From 78b4ab969e79bc34bdac5e391aa1cbd4603745b2 Mon Sep 17 00:00:00 2001 From: Rhys Campbell Date: Mon, 4 Mar 2024 06:52:18 +0100 Subject: [PATCH 3/3] Fix param name --- plugins/doc_fragments/ssl_options.py | 6 ++++-- plugins/module_utils/mongodb_common.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/doc_fragments/ssl_options.py b/plugins/doc_fragments/ssl_options.py index 012432806..ee69829ae 100644 --- a/plugins/doc_fragments/ssl_options.py +++ b/plugins/doc_fragments/ssl_options.py @@ -58,11 +58,13 @@ class ModuleDocFragment(object): type: str aliases: - tlsCertificateKeyFilePassword - tls_user_system_ca: + tls_use_system_ca: description: - Use the system-wide CA certificate store. type: bool - default: false + default: true + aliases: + - tlsUseSystemCA auth_mechanism: description: - Authentication type. diff --git a/plugins/module_utils/mongodb_common.py b/plugins/module_utils/mongodb_common.py index 7f1860be3..2b1997255 100644 --- a/plugins/module_utils/mongodb_common.py +++ b/plugins/module_utils/mongodb_common.py @@ -145,7 +145,7 @@ def mongodb_common_argument_spec(ssl_options=True): ssl_certfile=dict(type='str', default=None, aliases=['tlsCertificateKeyFile']), ssl_keyfile=dict(type='str', default=None, no_log=True), ssl_pem_passphrase=dict(type='str', default=None, no_log=True, aliases=['tlsCertificateKeyFilePassword']), - tls_user_system_ca=dict(type='bool', required=False, default=True, aliases=['tlsUseSystemCA']), + tls_use_system_ca=dict(type='bool', required=False, default=True, aliases=['tlsUseSystemCA']), auth_mechanism=dict(type='str', required=False, default=None,