hashi_vault - add alternate methods (env, ini, vars) for ca_cert op…

…tion (#97) * add env and ansible vars for ca_cert option * Add changelog fragment for #97 * add INI for ca_cert
ansible-collections · Jun 19, 2021 · 42c0212 · 42c0212
1 parent 5a71552
commit 42c0212
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/changelogs/fragments/97-ca_cert-env-and-vars.yml b/changelogs/fragments/97-ca_cert-env-and-vars.yml
@@ -0,0 +1,5 @@
+---
+minor_changes:
+  - hashi_vault - add ``ANSIBLE_HASHI_VAULT_CA_CERT`` env var (with ``VAULT_CACERT`` low-precedence fallback) for ``ca_cert`` option (https://github.com/ansible-collections/community.hashi_vault/pull/97).
+  - hashi_vault - add ``ansible_hashi_vault_ca_cert`` ansible var for ``ca_cert`` option (https://github.com/ansible-collections/community.hashi_vault/pull/97).
+  - hashi_vault - add ``ca_cert`` INI config file key ``ca_cert`` option (https://github.com/ansible-collections/community.hashi_vault/pull/97).
diff --git a/plugins/doc_fragments/connection.py b/plugins/doc_fragments/connection.py
@@ -48,6 +48,16 @@ class ModuleDocFragment(object):
         version_added: '1.1.0'
       ca_cert:
         description: Path to certificate to use for authentication.
+        env:
+          - name: ANSIBLE_HASHI_VAULT_CA_CERT
+            version_added: '1.2.0'
+        ini:
+          - section: lookup_hashi_vault
+            key: ca_cert
+            version_added: '1.2.0'
+        vars:
+          - name: ansible_hashi_vault_ca_cert
+            version_added: '1.2.0'
         aliases: [ cacert ]
       validate_certs:
         description:

diff --git a/plugins/module_utils/_hashi_vault_common.py b/plugins/module_utils/_hashi_vault_common.py
@@ -197,6 +197,7 @@ class HashiVaultOptionGroupBase:
         'namespace': ['VAULT_NAMESPACE'],
         'token': ['VAULT_TOKEN'],
         'url': ['VAULT_ADDR'],
+        'ca_cert': ['VAULT_CACERT'],
     }
 
     def __init__(self, option_adapter):