From 8629432ccb62f44a1920f9b2f432e49219a81eda Mon Sep 17 00:00:00 2001 From: Soren Hansen Date: Thu, 15 Jul 2010 12:04:57 -0500 Subject: Make sure we pass str objects instead of unicode objects to boto as our credentials. --- nova/endpoint/images.py | 4 ++-- 1 file 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, -- cgit