summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/cloud.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 9327bf0d4..9cabd2e7d 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -994,7 +994,10 @@ class CloudController(object):
return True
def describe_images(self, context, image_id=None, **kwargs):
- imageSet = self.image_service.index(context, image_id)
+ # Note: image_id is a list!
+ imageSet = self.image_service.index(context)
+ if image_id:
+ imageSet = filter(lambda x: x['imageId'] in image_id, imageSet)
return {'imagesSet': imageSet}
def deregister_image(self, context, image_id, **kwargs):