summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJustin Santa Barbara <justin@fathomdb.com>2011-02-22 18:42:23 -0800
committerJustin Santa Barbara <justin@fathomdb.com>2011-02-22 18:42:23 -0800
commit3ef3dfc2f6c8b9cc14119793df4990432ff74ea2 (patch)
tree69f8a308aae6948f2922034381bf027f7290ced6 /nova
parent9f169fdef93898097e33b5e1c0318f543ced672e (diff)
downloadnova-3ef3dfc2f6c8b9cc14119793df4990432ff74ea2.tar.gz
nova-3ef3dfc2f6c8b9cc14119793df4990432ff74ea2.tar.xz
nova-3ef3dfc2f6c8b9cc14119793df4990432ff74ea2.zip
Return null if no kernel_id / ramdisk_id
Diffstat (limited to 'nova')
-rw-r--r--nova/api/openstack/servers.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 41b05cbb4..d83bd34ab 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -151,6 +151,7 @@ class Controller(wsgi.Controller):
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)