summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevin Carlen <devin.carlen@gmail.com>2011-03-28 19:32:14 +0000
committerTarmac <>2011-03-28 19:32:14 +0000
commit616d4dc27d960c2c5a95fb5121d69151cc3638f9 (patch)
tree6acbc11722e14552569d0eaed8a0885fc1b665a6
parent782b5c3554008a44da2ea1a45db6b69ff5735e9e (diff)
parent9fdf9967234d8553c3548ad03fc3b2691285fa7d (diff)
downloadnova-616d4dc27d960c2c5a95fb5121d69151cc3638f9.tar.gz
nova-616d4dc27d960c2c5a95fb5121d69151cc3638f9.tar.xz
nova-616d4dc27d960c2c5a95fb5121d69151cc3638f9.zip
This fixes EC2 API so that it returns image displayName and description properly.
-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')