diff options
| author | Nirmal Ranganathan <nirmal.ranganathan@rackspace.com> | 2011-05-16 11:13:36 -0500 |
|---|---|---|
| committer | Nirmal Ranganathan <nirmal.ranganathan@rackspace.com> | 2011-05-16 11:13:36 -0500 |
| commit | d031368b9bba8c9fca066bc6bbce511581806fa5 (patch) | |
| tree | 0c114c887ebdf2ef9c5d4eecfeca4622d47bbfc3 /nova/api | |
| parent | 262dec736fa6ef54a1101a0a17671ff2a19cbd95 (diff) | |
| parent | 6f547c6977d3a200f3799067c68dafd24144be0d (diff) | |
| download | nova-d031368b9bba8c9fca066bc6bbce511581806fa5.tar.gz nova-d031368b9bba8c9fca066bc6bbce511581806fa5.tar.xz nova-d031368b9bba8c9fca066bc6bbce511581806fa5.zip | |
Merge from trunk
Diffstat (limited to 'nova/api')
| -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 1289c1e0a..22a5c54a6 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'] |