diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-10 05:21:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-10 05:21:40 +0000 |
| commit | ac557d5778089d4f83160901039db3b1c766dc78 (patch) | |
| tree | a523604f1c9bd2494738a5295f4b462bd6c68d3d /nova/api | |
| parent | 53739e6115aef12a02186796e326f610486a2b43 (diff) | |
| parent | a6ac8af69351cb39aa07f53e3327ff29b90383bc (diff) | |
Merge "Display owner in ec2 describe images"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index a93124e7a..aa1f2203c 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -1404,7 +1404,7 @@ class CloudController(object): ramdisk_id = image['properties'].get('ramdisk_id') if ramdisk_id: i['ramdiskId'] = ec2utils.image_ec2_id(ramdisk_id, 'ari') - i['imageOwnerId'] = image['properties'].get('owner_id') + i['imageOwnerId'] = image.get('owner') img_loc = image['properties'].get('image_location') if img_loc: |