diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-05-05 15:35:34 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-05-05 15:35:34 -0400 |
| commit | 2cfa0ab48e981e31484287936fbc738d6073f473 (patch) | |
| tree | 8bc8dc090c40f1a5e7ab5b6e7814e511d6ee0aab /nova | |
| parent | 114a55d0243f79db7ea1ef29830a9428dbf1aa33 (diff) | |
removing rogue TimeoutException
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/openstack/servers.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 3cf78e32c..547310613 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -594,10 +594,7 @@ class ControllerV10(Controller): def _parse_update(self, context, server_id, inst_dict, update_dict): if 'adminPass' in inst_dict['server']: update_dict['admin_pass'] = inst_dict['server']['adminPass'] - try: - self.compute_api.set_admin_password(context, server_id) - except exception.TimeoutException: - return exc.HTTPRequestTimeout() + self.compute_api.set_admin_password(context, server_id) def _action_rebuild(self, info, request, instance_id): context = request.environ['nova.context'] |