diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-07-15 12:04:57 -0500 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-07-15 12:04:57 -0500 |
| commit | 8629432ccb62f44a1920f9b2f432e49219a81eda (patch) | |
| tree | 469ca5662d1abe04bee085a490399b42bcf39ddf | |
| parent | 122fe2b75f635df0aa3858d05ed6775b76a9776e (diff) | |
Make sure we pass str objects instead of unicode objects to boto as our credentials.
| -rw-r--r-- | nova/endpoint/images.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/endpoint/images.py b/nova/endpoint/images.py index 5c6514732..b17e96819 100644 --- a/nova/endpoint/images.py +++ b/nova/endpoint/images.py @@ -79,8 +79,8 @@ def deregister(context, image_id): def conn(context): return boto.s3.connection.S3Connection ( - aws_access_key_id='%s:%s' % (context.user.access, context.project.name), - aws_secret_access_key=context.user.secret, + aws_access_key_id=str('%s:%s' % (context.user.access, context.project.name)), + aws_secret_access_key=str(context.user.secret), is_secure=False, calling_format=boto.s3.connection.OrdinaryCallingFormat(), port=FLAGS.s3_port, |