summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Willey <todd@ansolabs.com>2011-01-27 09:51:47 +0000
committerTarmac <>2011-01-27 09:51:47 +0000
commitabb1111ee67d1d157b249c004584dfc16642536e (patch)
tree5f869b6ad80e8c0319c6b9ee71477ac33f64f61c
parentaf67241089ec9e078cadf4e6d7c2c93b4b352315 (diff)
parent504118b849962f85626be2631e195f6bda29f4d6 (diff)
Fix regression in s3 image service. This should be a feature freeze exception.
-rw-r--r--nova/image/s3.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/nova/image/s3.py b/nova/image/s3.py
index c60b215a0..08a40f191 100644
--- a/nova/image/s3.py
+++ b/nova/image/s3.py
@@ -69,9 +69,7 @@ class S3ImageService(service.BaseImageService):
"""S3 has imageId but OpenStack wants id"""
for image in images:
if 'imageId' in image:
- image_id = image['imageId']
- del image['imageId']
- image['id'] = image_id
+ image['id'] = image['imageId']
return images
def index(self, context):