diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-05-09 15:26:32 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-05-09 15:26:32 +0000 |
| commit | d0e9ed0253fa4c950a421f85efb4cea561c2cc8b (patch) | |
| tree | 012dc9e801876bea34ea0c90ea1b20d74613e55f | |
| parent | 02b97593d0b3ee60ab879e5184be742ef3ac1b64 (diff) | |
| parent | 2cfa0ab48e981e31484287936fbc738d6073f473 (diff) | |
| download | nova-d0e9ed0253fa4c950a421f85efb4cea561c2cc8b.tar.gz nova-d0e9ed0253fa4c950a421f85efb4cea561c2cc8b.tar.xz nova-d0e9ed0253fa4c950a421f85efb4cea561c2cc8b.zip | |
Removing a rogue try/catch expecting a non-existant exception.TimeoutException that is never raised.
| -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'] |