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/compute | |
| parent | fb6a2d15be16f664b2159526fa339019ed4c204a (diff) | |
| parent | 231f40af80c69f80aec4922f1261f4fdf5365a3c (diff) | |
Merge "Converting set password to use instance objects"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 2b0db25f4..6549031e2 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1430,8 +1430,11 @@ class API(base.Base): self._cast_compute_message('unrescue_instance', context, instance_id) @scheduler_api.reroute_compute("set_admin_password") - def set_admin_password(self, context, instance_id, password=None): + def set_admin_password(self, context, instance, password=None): """Set the root/admin password for the given instance.""" + #NOTE(bcwaldon): we need to use the integer id here since manager uses + # db.instance_get, not db.instance_get_by_uuid + instance_id = instance['id'] self.update(context, instance_id, task_state=task_states.UPDATING_PASSWORD) |