diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-02-15 15:27:59 -0600 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2011-02-15 15:27:59 -0600 |
| commit | 92c02908b3e33806e706ba9c59ca35398b645345 (patch) | |
| tree | 5290ba271d6fdc8377ca4b6713b4026bc7688610 /nova/api | |
| parent | 503749849df73df1732583bc9452e7952bf78ac2 (diff) | |
| parent | 273e6703a9e4f7e3b7810f204ffb6bb0f86602bd (diff) | |
| download | nova-92c02908b3e33806e706ba9c59ca35398b645345.tar.gz nova-92c02908b3e33806e706ba9c59ca35398b645345.tar.xz nova-92c02908b3e33806e706ba9c59ca35398b645345.zip | |
merge with 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': []} |