OpenStack Compute (nova)

Merge lp:~anso/nova/lp708367 into lp:~hudson-openstack/nova/trunk

  1. lp708367
  2. Merge into trunk
Proposed by Todd Willey
Status: Merged
Approved by: Soren Hansen
Approved revision: 627
Merged at revision: 625
Proposed branch: lp:~anso/nova/lp708367
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 14 lines (+1/-3)
1 file modified
nova/image/s3.py (+1/-3)
To merge this branch: bzr merge lp:~anso/nova/lp708367
Reviewer Review Type Date Requested Status
Soren Hansen (community) Approve
Vish Ishaya (community) Approve
Thierry Carrez (community) Approve
Review via email: mp+47636@code.launchpad.net

Description of the change

Fix regression in s3 image service. This should be a feature freeze exception.

To post a comment you must log in.
Revision history for this message
Thierry Carrez (ttx) wrote :

This looks good... Doesn't require an exception to the process, since it's a bugfix.

review: Approve
lp:~anso/nova/lp708367 updated
626. By Todd Willey

more instanceId => id fixes

627. By Todd Willey

I have a feeling if we try to migrate from imageId to id we'll be tracking it down a while.

Revision history for this message
Vish Ishaya (vishvananda) wrote :

lgtm

review: Approve
Revision history for this message
Soren Hansen (soren) wrote :

ok.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/image/s3.py'
2--- nova/image/s3.py 2011-01-26 21:12:35 +0000
3+++ nova/image/s3.py 2011-01-27 08:33:10 +0000
4@@ -69,9 +69,7 @@
5 """S3 has imageId but OpenStack wants id"""
6 for image in images:
7 if 'imageId' in image:
8- image_id = image['imageId']
9- del image['imageId']
10- image['id'] = image_id
11+ image['id'] = image['imageId']
12 return images
13
14 def index(self, context):