summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorDevin Carlen <devin.carlen@gmail.com>2011-03-28 11:56:19 -0700
committerDevin Carlen <devin.carlen@gmail.com>2011-03-28 11:56:19 -0700
commit9fdf9967234d8553c3548ad03fc3b2691285fa7d (patch)
treeb7101b1b9d7a8d0e4d80f28ffbd3b3209be29471 /nova
parentddbb00fc3c3a2fe74234298a206d2e6a91513a33 (diff)
Added image name and description mapping to ec2 api
Diffstat (limited to 'nova')
-rw-r--r--nova/api/ec2/cloud.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 0da642318..9e34d3317 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -890,6 +890,8 @@ class CloudController(object):
i['imageOwnerId'] = image['properties'].get('owner_id')
i['imageLocation'] = image['properties'].get('image_location')
i['imageState'] = image['properties'].get('image_state')
+ i['displayName'] = image.get('name')
+ i['description'] = image.get('description')
i['type'] = image_type
i['isPublic'] = str(image['properties'].get('is_public', '')) == 'True'
i['architecture'] = image['properties'].get('architecture')