diff options
| author | Justin Santa Barbara <justin@fathomdb.com> | 2011-02-23 18:40:59 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-02-23 18:40:59 +0000 |
| commit | 9664c9d6a24424c0e1b561b17596adc5cfea5c38 (patch) | |
| tree | 400aadff9af16a8c0e2ee7105abf508c70baead1 /nova/api | |
| parent | 70bc1d4280065f6eba368187af126cebcb6b69bb (diff) | |
| parent | 3ef3dfc2f6c8b9cc14119793df4990432ff74ea2 (diff) | |
| download | nova-9664c9d6a24424c0e1b561b17596adc5cfea5c38.tar.gz nova-9664c9d6a24424c0e1b561b17596adc5cfea5c38.tar.xz nova-9664c9d6a24424c0e1b561b17596adc5cfea5c38.zip | |
The kernel_id and the ramdisk_id are optional, yet the OpenStack API was requiring them. In addition, with the ObjectStore these properties are not under 'properties' (as they are with Glance)
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/servers.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index a8e597d73..53eb9fcf1 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -152,9 +152,10 @@ class Controller(wsgi.Controller): try: return image['properties'][param] except KeyError: - raise exception.NotFound( + LOG.debug( _("%(param)s property not found for image %(_image_id)s") % locals()) + return None image_id = str(image_id) image = self._image_service.show(req.environ['nova.context'], image_id) |