diff options
| author | Soren Hansen <soren@linux2go.dk> | 2011-02-16 19:09:40 +0100 |
|---|---|---|
| committer | Soren Hansen <soren@linux2go.dk> | 2011-02-16 19:09:40 +0100 |
| commit | 775fc13f8ea85bb74f8f55dedc02f44cb5aac2b9 (patch) | |
| tree | 66b6289cb1e5a418384b7ed1d973cf6c5a4f984f /nova/api | |
| parent | ef7e1003a2f7f0743808236e7e10d2a2b4369de6 (diff) | |
| parent | 17abf5c23f90f15b557131f71657e70e7b5cdef8 (diff) | |
Merge trunk
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': []} |