Skip to content

Commit 476f6d0

Browse files
authored
Merge pull request ceph#63271 from rafaelweingartner/parameter_to_externalize_secret_key_ttl-upstream-2
rgw: Externalize Keystone secret key cache TTL Reviewed-by: Matt Benjamin <[email protected]> Reviewed-by: Adam C. Emerson <[email protected]> Reviewed-by: Tobias Urdin <[email protected]>
2 parents 8f2b2ad + 51d447b commit 476f6d0

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

src/common/options/rgw.yaml.in

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -844,6 +844,16 @@ options:
844844
services:
845845
- rgw
846846
with_legacy: true
847+
- name: rgw_keystone_token_cache_ttl
848+
type: int
849+
level: advanced
850+
desc: Keystone token secret key cache TTL
851+
long_desc: The TTL for secret keys that are loaded from Keystone and stored in the cache system.
852+
fmt_desc: The maximum TTL that a secret loaded from Keystone is maintained in the token cache system.
853+
default: 300
854+
services:
855+
- rgw
856+
with_legacy: true
847857
- name: rgw_keystone_verify_ssl
848858
type: bool
849859
level: advanced

src/rgw/rgw_auth_keystone.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class SecretCache {
102102
: cct(g_ceph_context),
103103
lock(),
104104
max(cct->_conf->rgw_keystone_token_cache_size),
105-
s3_token_expiry_length(300, 0) {
105+
s3_token_expiry_length(cct->_conf->rgw_keystone_token_cache_ttl, 0) {
106106
}
107107

108108
~SecretCache() {}

0 commit comments

Comments
 (0)