openstack/nova
Code Issues Proposed changes

This branch fixes some unfortunate interaction between Nova and boto.

Browse Source
This commit is contained in:
Soren Hansen 2010-07-15 15:09:19 -05:00
commit 67d4e16a8c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/endpoint/images.py
View File

@ -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,