diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-16 01:31:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-16 01:31:53 +0000 |
| commit | 1ce6a87738be1d6694c3feaf048547f7c58a1604 (patch) | |
| tree | 54f29d0649b0ea65eefb07a3d893aac318ef37ef | |
| parent | 7c9d6f0a8ef84cc43d46bc3cdb9e584cbbf168b2 (diff) | |
| parent | f20f7c4b676e6c94807d9d1e37e729ab27855e64 (diff) | |
| download | keystone-8.0.0a0.tar.gz | |
Merge "Needn't load fernet keys twice"8.0.0a0
| -rw-r--r-- | keystone/token/providers/fernet/token_formatters.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystone/token/providers/fernet/token_formatters.py b/keystone/token/providers/fernet/token_formatters.py index a4dba3f86..6e1e70b58 100644 --- a/keystone/token/providers/fernet/token_formatters.py +++ b/keystone/token/providers/fernet/token_formatters.py @@ -61,7 +61,7 @@ class TokenFormatter(object): if not keys: raise exception.KeysNotFound() - fernet_instances = [fernet.Fernet(key) for key in utils.load_keys()] + fernet_instances = [fernet.Fernet(key) for key in keys] return fernet.MultiFernet(fernet_instances) def pack(self, payload): |