summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorMark Washenberger <mark.washenberger@rackspace.com>2012-03-02 17:39:58 -0500
committerMark Washenberger <mark.washenberger@rackspace.com>2012-03-02 17:39:58 -0500
commitd7acf13525aaac43a08fa4763bc149e708ab7d39 (patch)
tree363a40c9c656c97e4b65c87d15f026b7e9e7537e /nova/api
parent8a530832c599f8866e98947976d74a5332d877af (diff)
downloadnova-d7acf13525aaac43a08fa4763bc149e708ab7d39.tar.gz
nova-d7acf13525aaac43a08fa4763bc149e708ab7d39.tar.xz
nova-d7acf13525aaac43a08fa4763bc149e708ab7d39.zip
Handle InstanceNotFound during server update
fixes bug 945206 Change-Id: I4e5519cf03e61db78ee1f147f07bc2d1c0e01c49
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/servers.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index b27f1802c..5dc5cff49 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -807,9 +807,8 @@ class Controller(wsgi.Controller):
body['server']['auto_disk_config'])
update_dict['auto_disk_config'] = auto_disk_config
- instance = self.compute_api.get(ctxt, id)
-
try:
+ instance = self.compute_api.get(ctxt, id)
self.compute_api.update(ctxt, instance, **update_dict)
except exception.NotFound:
raise exc.HTTPNotFound()