diff options
Diffstat (limited to 'keystone/middleware/ec2_token.py')
| -rw-r--r-- | keystone/middleware/ec2_token.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/keystone/middleware/ec2_token.py b/keystone/middleware/ec2_token.py index 7cd007c7..265ccaa6 100644 --- a/keystone/middleware/ec2_token.py +++ b/keystone/middleware/ec2_token.py @@ -24,7 +24,6 @@ Starting point for routing EC2 requests. import urlparse -from eventlet.green import httplib import webob.dec import webob.exc @@ -32,6 +31,7 @@ from nova import flags from nova import utils from nova import wsgi +from keystone.common import environment FLAGS = flags.FLAGS flags.DEFINE_string('keystone_ec2_url', @@ -75,9 +75,9 @@ class EC2Token(wsgi.Middleware): # pylint: disable-msg=E1101 o = urlparse.urlparse(FLAGS.keystone_ec2_url) if o.scheme == 'http': - conn = httplib.HTTPConnection(o.netloc) + conn = environment.httplib.HTTPConnection(o.netloc) else: - conn = httplib.HTTPSConnection(o.netloc) + conn = environment.httplib.HTTPSConnection(o.netloc) conn.request('POST', o.path, body=creds_json, headers=headers) response = conn.getresponse().read() conn.close() |