summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nova/endpoint/images.py4
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,