summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorDan Prince <dan.prince@rackspace.com>2011-02-15 13:50:21 +0000
committerTarmac <>2011-02-15 13:50:21 +0000
commitaf2da1311e21aced75d80c95bffbd26106be90df (patch)
treef70fcae81ee70750fb2bef400a78005c5b6968cd /nova/api
parent0a93ef16bbb999b75a951adb73612338579db954 (diff)
parentf1e536fb296c927a9fc953b1dfe24b9060a0387a (diff)
Fixes issues when running euca-run-instances and euca-describe-image-attribute against the latest nova/trunk EC2 API.
I noticed this late this afternoon and saw some IRC traffic with other users hitting the issue as well.
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/cloud.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 16a3a4521..6919cd8d2 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -883,6 +883,9 @@ class CloudController(object):
% attribute)
try:
image = self.image_service.show(context, image_id)
+ image = self._format_image(context,
+ self.image_service.show(context,
+ image_id))
except IndexError:
raise exception.ApiError(_('invalid id: %s') % image_id)
result = {'image_id': image_id, 'launchPermission': []}