summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-02-23 11:26:20 -0800
committerVishvananda Ishaya <vishvananda@gmail.com>2011-02-23 11:26:20 -0800
commitd8611e324680d8514995d6c222ffd440595a87cf (patch)
treec5745d40270aad58b92e70bfa8c87d3bd6a1e120 /nova/api
parente7f2a1663526c26903fb0605533d10ca1e8a9428 (diff)
parent400bbd8c7d56543a5cebad25d078ec0331b07a3c (diff)
downloadnova-d8611e324680d8514995d6c222ffd440595a87cf.tar.gz
nova-d8611e324680d8514995d6c222ffd440595a87cf.tar.xz
nova-d8611e324680d8514995d6c222ffd440595a87cf.zip
merged trunk
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/servers.py3
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)