From 46e2c8a575fecc55a896632029d5db6b5bd7b112 Mon Sep 17 00:00:00 2001
From: Chuck Short <chuck.short@canonical.com>
Date: Wed, 1 Aug 2012 13:03:15 -0500
Subject: Fix traceback when using s3.

Fix a regression that causes tracebacks in s3

Traceback (most recent call last):
  File "/opt/stack/nova/nova/image/s3.py", line 294, in delayed_create
     _update_image_state(context, image_uuid, 'downloading')
  File "/opt/stack/nova/nova/image/s3.py", line 286, in _update_image_state
  	headers)
 TypeError: update() takes at most 5 arguments (6 given)

This is due to 6e4539f397bfc5dbf9ec88ddc3968621815d576b

Fixes LP: #1031867

Change-Id: I6cf786999c623c0ca780a173dcba49354207e9c3
Signed-off-by: Chuck Short <chuck.short@canonical.com>
---
 nova/image/glance.py       | 4 ++--
 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:
-- 
cgit