diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-01 19:11:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-01 19:11:03 +0000 |
| commit | acb0f81f8ae99c4d726abbfb059d5be6e23f3075 (patch) | |
| tree | 0037a2c655975a1b06b82c75734b1c615026cdcb /nova | |
| parent | f08cbf615206997df01f1abfc2189424430ef53e (diff) | |
| parent | 46e2c8a575fecc55a896632029d5db6b5bd7b112 (diff) | |
Merge "Fix traceback when using s3."
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/image/glance.py | 4 | ||||
| -rw-r--r-- | nova/tests/glance/stubs.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/image/glance.py b/nova/image/glance.py index 0167a25fc..9aa54eb18 100644 --- a/nova/image/glance.py +++ b/nova/image/glance.py @@ -239,7 +239,7 @@ class GlanceImageService(object): base_image_meta = self._translate_from_glance(recv_service_image_meta) return base_image_meta - def update(self, context, image_id, image_meta, data=None): + def update(self, context, image_id, image_meta, data=None, features=None): """Replace the contents of the given image with the new data. :raises: ImageNotFound if the image does not exist. @@ -250,7 +250,7 @@ class GlanceImageService(object): image_meta = self._translate_to_glance(image_meta) try: image_meta = self._client.call(context, 'update_image', - image_id, image_meta, data) + image_id, image_meta, data, features) except Exception: _reraise_translated_image_exception(image_id) diff --git a/nova/tests/glance/stubs.py b/nova/tests/glance/stubs.py index 4811169fc..b3cef0ff3 100644 --- a/nova/tests/glance/stubs.py +++ b/nova/tests/glance/stubs.py @@ -69,7 +69,7 @@ class StubGlanceClient(object): return self.images[-1] - def update_image(self, image_id, metadata, data): + def update_image(self, image_id, metadata, data, features): for i, image in enumerate(self.images): if image['id'] == str(image_id): if 'id' in metadata: |