From 231f40af80c69f80aec4922f1261f4fdf5365a3c Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Thu, 10 Nov 2011 16:34:50 -0500
Subject: Converting set password to use instance objects

Related to blueprint internal-uuids

Change-Id: Ifd229c7b9a9b69040a04289d4a98385fc946c734
---
 nova/compute/api.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'nova/compute')

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 820a7b9b6..0c1583e65 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -1429,8 +1429,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)
-- 
cgit