diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-11 18:42:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-11 18:42:39 +0000 |
| commit | ed3635f40fa31b896bb700610b93fe288a90e692 (patch) | |
| tree | d0406a2ade46b979515a02711a4b22a8c7329655 /nova/api | |
| parent | fb6a2d15be16f664b2159526fa339019ed4c204a (diff) | |
| parent | 231f40af80c69f80aec4922f1261f4fdf5365a3c (diff) | |
| download | nova-ed3635f40fa31b896bb700610b93fe288a90e692.tar.gz nova-ed3635f40fa31b896bb700610b93fe288a90e692.tar.xz nova-ed3635f40fa31b896bb700610b93fe288a90e692.zip | |
Merge "Converting set password to use instance objects"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/servers.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 539fd8778..b913a2bb5 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -744,7 +744,8 @@ class Controller(object): if not isinstance(password, basestring) or password == '': msg = _("Invalid adminPass") raise exc.HTTPBadRequest(explanation=msg) - self.compute_api.set_admin_password(context, id, password) + server = self._get_server(context, id) + self.compute_api.set_admin_password(context, server, password) return webob.Response(status_int=202) def _limit_items(self, items, req): |