openstack/castellan
Code Issues Proposed changes

Support setting Vault kv version config

Browse Source 
Change-Id: If1e244c808eeb5303b6b29d723cd60cdb66e6e86
This commit is contained in:
Lingxian Kong 2021-09-07 15:17:57 +12:00
parent ecf625b65c
commit 4b6f73a671
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
castellan/options.py
View File

@ -47,7 +47,8 @@ def set_defaults(conf, backend=None, barbican_endpoint=None,
vault_kv_mountpoint=None, vault_url=None,
vault_ssl_ca_crt_file=None, vault_use_ssl=None,
vault_namespace=None,
barbican_endpoint_type=None):
barbican_endpoint_type=None,
vault_kv_version=None):
"""Set defaults for configuration values.
Overrides the default options values.
@ -71,6 +72,7 @@ def set_defaults(conf, backend=None, barbican_endpoint=None,
:param vault_namespace: Namespace to use for all requests to Vault.
:param barbican_endpoint_type: Use this to specify the type of URL.
: Valid values are: public, internal or admin.
:param vault_kv_version: Use this for the kv version for vault.
"""
conf.register_opts(key_manager.key_manager_opts, group='key_manager')
@ -139,6 +141,9 @@ def set_defaults(conf, backend=None, barbican_endpoint=None,
if vault_namespace is not None:
conf.set_default('namespace', vault_namespace,
group=vkm._VAULT_OPT_GROUP)
if vault_kv_version is not None:
conf.set_default('kv_version', vault_kv_version,
group=vkm._VAULT_OPT_GROUP)
def enable_logging(conf=None, app_name='castellan'):