diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-02-14 19:51:51 -0500 |
|---|---|---|
| committer | Dan Prince <dan.prince@rackspace.com> | 2011-02-14 19:51:51 -0500 |
| commit | f1e536fb296c927a9fc953b1dfe24b9060a0387a (patch) | |
| tree | f70fcae81ee70750fb2bef400a78005c5b6968cd /nova/api | |
| parent | 0a93ef16bbb999b75a951adb73612338579db954 (diff) | |
| download | nova-f1e536fb296c927a9fc953b1dfe24b9060a0387a.tar.gz nova-f1e536fb296c927a9fc953b1dfe24b9060a0387a.tar.xz nova-f1e536fb296c927a9fc953b1dfe24b9060a0387a.zip | |
Updates to that S3ImageService kernel_id and ramdisk_id mappings work with
EC2 API.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 3 |
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': []} |