From 4b6f73a671e13b6cdb936c3f72c095b1f7944117 Mon Sep 17 00:00:00 2001 From: Lingxian Kong Date: Tue, 7 Sep 2021 15:17:57 +1200 Subject: [PATCH] Support setting Vault kv version config Change-Id: If1e244c808eeb5303b6b29d723cd60cdb66e6e86 --- castellan/options.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/castellan/options.py b/castellan/options.py index 7a5410d1..83a7016c 100644 --- a/castellan/options.py +++ b/castellan/options.py @@ -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'):