From a6ac8af69351cb39aa07f53e3327ff29b90383bc Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Fri, 9 Mar 2012 18:19:29 -0800
Subject: Display owner in ec2 describe images

 * use owner field from glance
 * remove unneccessary project_id field in s3 registration
 * fixes bug 798998

Change-Id: I8d88ff258b914899212d63a7d31d83722d0cb559
---
 nova/api/ec2/cloud.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index f4886551d..0203ed5b7 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -1392,7 +1392,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:
-- 
cgit