diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-02 23:54:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-02 23:54:37 +0000 |
| commit | 49f60715e682d8ef6139d1d2b30f744bf43bb2f5 (patch) | |
| tree | a15809ba9bc0978c2c27a61e02ae0052754be29d /nova/api | |
| parent | 665c453ec2c1c8cc7ccdd5870fbbf0c01e2cf2db (diff) | |
| parent | d7acf13525aaac43a08fa4763bc149e708ab7d39 (diff) | |
Merge "Handle InstanceNotFound during server update"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 3 |
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() |