summaryrefslogtreecommitdiffstats
path: root/keystone
diff options
context:
space:
mode:
authorDerek Higgins <derekh@redhat.com>2012-06-05 09:33:53 +0100
committerDerek Higgins <derekh@redhat.com>2012-06-05 15:27:13 +0100
commit375838cfceb88cacc312ff6564e64eb18ee6a355 (patch)
tree36a5ac966b652e69b39f70d5596b027c5ee972a6 /keystone
parent17723a6b6dc047e6341bcfcda29120580f352b46 (diff)
downloadkeystone-375838cfceb88cacc312ff6564e64eb18ee6a355.tar.gz
keystone-375838cfceb88cacc312ff6564e64eb18ee6a355.tar.xz
keystone-375838cfceb88cacc312ff6564e64eb18ee6a355.zip
Carrying over token expiry time when token chaining
Fixes bug #998185 This commit causes the token expiry time to be maintained when one token is being created from another Change-Id: I7b61692a60d9227423b93c267864a5abe939ca33
Diffstat (limited to 'keystone')
-rw-r--r--keystone/service.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/keystone/service.py b/keystone/service.py
index 2b024f4e..ebdea50a 100644
--- a/keystone/service.py
+++ b/keystone/service.py
@@ -351,7 +351,8 @@ class TokenController(wsgi.Application):
context, token_id, dict(id=token_id,
user=user_ref,
tenant=tenant_ref,
- metadata=metadata_ref))
+ metadata=metadata_ref,
+ expires=old_token_ref['expires']))
# TODO(termie): optimize this call at some point and put it into the
# the return for metadata