diff options
| author | Christian Schwede <cschwede@redhat.com> | 2015-06-24 23:52:35 +0200 |
|---|---|---|
| committer | Christian Schwede <cschwede@redhat.com> | 2015-06-24 23:59:07 +0200 |
| commit | 01c8ccdcf5e9c8bacabf84930e802a8ebaf0448d (patch) | |
| tree | 316ebe3e1cfb167a56b3a6373d7b73fb670225c1 | |
| parent | 99de02ee1c6c8e73eb81b440fac26bb64dfdaa2f (diff) | |
| download | glance_store-01c8ccdcf5e9c8bacabf84930e802a8ebaf0448d.tar.gz | |
Do not used named args when using swiftclient
The arguments "container" and "obj" are not named arguments in swiftclient, and
a pending change to python-swiftclient [1] is thus always failing in the gate.
Co-Authored-By: Clay Gerrard <clay.gerrard@gmail.com>
[1]: https://review.openstack.org/#/c/189815/
Change-Id: I3f4e3eb8d91edbfd10dc2233e3e83a3f90313cac
| -rw-r--r-- | glance_store/_drivers/swift/store.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/glance_store/_drivers/swift/store.py b/glance_store/_drivers/swift/store.py index f3fd7ff..9e20616 100644 --- a/glance_store/_drivers/swift/store.py +++ b/glance_store/_drivers/swift/store.py @@ -418,7 +418,7 @@ class BaseStore(driver.Store): try: resp_headers, resp_body = connection.get_object( - container=location.container, obj=location.obj, + location.container, location.obj, resp_chunk_size=self.CHUNKSIZE, headers=headers) except swiftclient.ClientException as e: if e.http_status == http_client.NOT_FOUND: @@ -456,7 +456,7 @@ class BaseStore(driver.Store): connection = self.get_connection(location, context=context) try: resp_headers = connection.head_object( - container=location.container, obj=location.obj) + location.container, location.obj) return int(resp_headers.get('content-length', 0)) except Exception: return 0 |