Codebase list python-castellan / 4563584
Merge tag '3.0.1' into debian/ussuri castellan 3.0.1 release meta:version: 3.0.1 meta:diff-start: - meta:series: ussuri meta:release-type: release meta:pypi: no meta:first: no meta:release:Author: Ben Nemec <bnemec@redhat.com> meta:release:Commit: Ben Nemec <bnemec@redhat.com> meta:release:Change-Id: I7e0feec33fa9ecf5a975b2a1776f4ff1100ec2eb meta:release:Code-Review+1: Douglas Mendizábal <dmendiza@redhat.com> meta:release:Code-Review+2: Sean McGinnis <sean.mcginnis@gmail.com> meta:release:Workflow+1: Sean McGinnis <sean.mcginnis@gmail.com> Thomas Goirand 4 years ago
1 changed file(s) with 7 addition(s) and 7 deletion(s). Raw diff Collapse all Expand all
+7
-7
castellan/options.py less more
109109 if vkm is not None:
110110 if vault_root_token_id is not None:
111111 conf.set_default('root_token_id', vault_root_token_id,
112 group=vkm.VAULT_OPT_GROUP)
112 group=vkm._VAULT_OPT_GROUP)
113113 if vault_approle_role_id is not None:
114114 conf.set_default('approle_role_id', vault_approle_role_id,
115 group=vkm.VAULT_OPT_GROUP)
115 group=vkm._VAULT_OPT_GROUP)
116116 if vault_approle_secret_id is not None:
117117 conf.set_default('approle_secret_id', vault_approle_secret_id,
118 group=vkm.VAULT_OPT_GROUP)
118 group=vkm._VAULT_OPT_GROUP)
119119 if vault_kv_mountpoint is not None:
120120 conf.set_default('kv_mountpoint', vault_kv_mountpoint,
121 group=vkm.VAULT_OPT_GROUP)
121 group=vkm._VAULT_OPT_GROUP)
122122 if vault_url is not None:
123123 conf.set_default('vault_url', vault_url,
124 group=vkm.VAULT_OPT_GROUP)
124 group=vkm._VAULT_OPT_GROUP)
125125 if vault_ssl_ca_crt_file is not None:
126126 conf.set_default('ssl_ca_crt_file', vault_ssl_ca_crt_file,
127 group=vkm.VAULT_OPT_GROUP)
127 group=vkm._VAULT_OPT_GROUP)
128128 if vault_use_ssl is not None:
129129 conf.set_default('use_ssl', vault_use_ssl,
130 group=vkm.VAULT_OPT_GROUP)
130 group=vkm._VAULT_OPT_GROUP)
131131
132132
133133 def enable_logging(conf=None, app_name='castellan'):