diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-01 01:17:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-01 01:17:56 +0000 |
| commit | f8d2021783889442f12ed1d3658097a91f2d1f53 (patch) | |
| tree | 43e6307bbdac3d7802344d8eef584021d9ad5b7e /nova/api | |
| parent | 36622fb6045ce588d0f040291b480aad39437c86 (diff) | |
| parent | 4dc160bf91d21b42363e5187adb96e59f95da717 (diff) | |
Merge "Removes retry of set_admin_password"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index ac4ebd293..88a52001c 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -1180,7 +1180,11 @@ class Controller(wsgi.Controller): msg = _("Invalid adminPass") raise exc.HTTPBadRequest(explanation=msg) server = self._get_server(context, req, id) - self.compute_api.set_admin_password(context, server, password) + try: + self.compute_api.set_admin_password(context, server, password) + except NotImplementedError: + msg = _("Unable to set password on instance") + raise exc.HTTPNotImplemented(explanation=msg) return webob.Response(status_int=202) def _validate_metadata(self, metadata): |