diff options
| author | Steven Hardy <shardy@redhat.com> | 2013-02-26 10:08:33 +0000 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2013-02-26 10:08:33 +0000 |
| commit | 39f12606a2c29196e0bb45134141ee438053e32d (patch) | |
| tree | 131827ecebdb25e1c1f83e430b0d8a87fc6c82ba /keystone/contrib/ec2 | |
| parent | ac2fb0f861b5bbe3a71f619fc917eaf845a2ea17 (diff) | |
| download | keystone-39f12606a2c29196e0bb45134141ee438053e32d.tar.gz keystone-39f12606a2c29196e0bb45134141ee438053e32d.tar.xz keystone-39f12606a2c29196e0bb45134141ee438053e32d.zip | |
keystone : Use Ec2Signer utility class from keystoneclient
The Ec2Signer class has been moved to python-keystoneclient,
so we can remove the internal implementation and import the
keystoneclient version
blueprint ec2signer-to-keystoneclient
Change-Id: I19d8575ab8b972467ce280a6197ae762da1ce790
Diffstat (limited to 'keystone/contrib/ec2')
| -rw-r--r-- | keystone/contrib/ec2/core.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/keystone/contrib/ec2/core.py b/keystone/contrib/ec2/core.py index d04b7455..246587a6 100644 --- a/keystone/contrib/ec2/core.py +++ b/keystone/contrib/ec2/core.py @@ -36,6 +36,8 @@ glance to list images needed to perform the requested task. import uuid +from keystoneclient.contrib.ec2 import utils as ec2_utils + from keystone.common import controller from keystone.common import dependency from keystone.common import manager @@ -98,7 +100,7 @@ class Ec2Extension(wsgi.ExtensionRouter): @dependency.requires('catalog_api', 'ec2_api') class Ec2Controller(controller.V2Controller): def check_signature(self, creds_ref, credentials): - signer = utils.Ec2Signer(creds_ref['secret']) + signer = ec2_utils.Ec2Signer(creds_ref['secret']) signature = signer.generate(credentials) if utils.auth_str_equal(credentials['signature'], signature): return |