Merge "s3token: Raise error on negative secret_cache_duration config"
This commit is contained in:
commit
43b43ca94a
@ -179,7 +179,9 @@ class S3Token(object):
|
|||||||
self._verify = None
|
self._verify = None
|
||||||
|
|
||||||
self._secret_cache_duration = int(conf.get('secret_cache_duration', 0))
|
self._secret_cache_duration = int(conf.get('secret_cache_duration', 0))
|
||||||
if self._secret_cache_duration > 0:
|
if self._secret_cache_duration < 0:
|
||||||
|
raise ValueError('secret_cache_duration must be non-negative')
|
||||||
|
if self._secret_cache_duration:
|
||||||
try:
|
try:
|
||||||
auth_plugin = keystone_loading.get_plugin_loader(
|
auth_plugin = keystone_loading.get_plugin_loader(
|
||||||
conf.get('auth_type', 'password'))
|
conf.get('auth_type', 'password'))
|
||||||
|
Loading…
Reference in New Issue
Block a user