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/api/openstack/servers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index ba9dd4ec3..02acdd1b9 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -745,7 +745,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):
-- 
cgit