diff options
| author | Dolph Mathews <dolph.mathews@gmail.com> | 2012-12-11 14:40:27 -0600 |
|---|---|---|
| committer | Dolph Mathews <dolph.mathews@gmail.com> | 2012-12-12 07:47:46 -0600 |
| commit | 4e2be8a8880f03b1c6d1dc663d7259dbb45ddf67 (patch) | |
| tree | 58fc05007116a591f96c8e19288d0aade27a1581 /keystone/contrib/ec2 | |
| parent | 6397580a52be5288b4cb5e0a86a8c340fe4fd0ae (diff) | |
| download | keystone-4e2be8a8880f03b1c6d1dc663d7259dbb45ddf67.tar.gz keystone-4e2be8a8880f03b1c6d1dc663d7259dbb45ddf67.tar.xz keystone-4e2be8a8880f03b1c6d1dc663d7259dbb45ddf67.zip | |
Move token controller into keystone.token
Change-Id: Ie8277529185f645854e0aebaafa173c06a7c5164
Diffstat (limited to 'keystone/contrib/ec2')
| -rw-r--r-- | keystone/contrib/ec2/core.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/keystone/contrib/ec2/core.py b/keystone/contrib/ec2/core.py index d9e9eaae..078a845c 100644 --- a/keystone/contrib/ec2/core.py +++ b/keystone/contrib/ec2/core.py @@ -44,7 +44,6 @@ from keystone import config from keystone import exception from keystone import identity from keystone import policy -from keystone import service from keystone import token @@ -190,12 +189,10 @@ class Ec2Controller(wsgi.Application): tenant=tenant_ref, metadata=metadata_ref)) - # TODO(termie): make this a util function or something # TODO(termie): i don't think the ec2 middleware currently expects a # full return, but it contains a note saying that it # would be better to expect a full return - token_controller = service.TokenController() - return token_controller._format_authenticate( + return token.controllers.Auth.format_authenticate( token_ref, roles_ref, catalog_ref) def create_credential(self, context, user_id, tenant_id): |