vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2057 from coreos-inc/fix-rados

Browse source 
Add missing parameter on RADOS storage
This commit is contained in:
josephschorr 2016-10-31 12:49:05 -04:00 committed by GitHub
commit bc8beb2d1e
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
storage/cloud.py
View file

@ -542,16 +542,18 @@ class RadosGWStorage(_CloudStorage):
'is_secure': is_secure, 'is_secure': is_secure,
'calling_format': boto.s3.connection.OrdinaryCallingFormat(), 'calling_format': boto.s3.connection.OrdinaryCallingFormat(),
} }
super(RadosGWStorage, self).__init__(metric_queue, boto.s3.connection.S3Connection, super(RadosGWStorage, self).__init__(metric_queue, boto.s3.connection.S3Connection,
boto.s3.key.Key, connect_kwargs, upload_params, boto.s3.key.Key, connect_kwargs, upload_params,
storage_path, bucket_name, access_key, secret_key) storage_path, bucket_name, access_key, secret_key)
# TODO remove when radosgw supports cors: http://tracker.ceph.com/issues/8718#change-38624 # TODO remove when radosgw supports cors: http://tracker.ceph.com/issues/8718#change-38624
def get_direct_download_url(self, path, expires_in=60, requires_cors=False): def get_direct_download_url(self, path, expires_in=60, requires_cors=False, head=False):
if requires_cors: if requires_cors:
return None return None
return super(RadosGWStorage, self).get_direct_download_url(path, expires_in, requires_cors) return super(RadosGWStorage, self).get_direct_download_url(path, expires_in, requires_cors,
head)
# TODO remove when radosgw supports cors: http://tracker.ceph.com/issues/8718#change-38624 # TODO remove when radosgw supports cors: http://tracker.ceph.com/issues/8718#change-38624
def get_direct_upload_url(self, path, mime_type, requires_cors=True): def get_direct_upload_url(self, path, mime_type, requires_cors=True):