From dd45bf735c073c9fb59d1d420d2e47713d28577d Mon Sep 17 00:00:00 2001
From: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date: Thu, 9 Aug 2012 15:17:35 +0000
Subject: Fix setting admin_pass in rescue command

Fixes bug 1034948

The database doesn't have an admin_pass column, so the instance_update()
call is a noop.

Change-Id: I9f22de1e926ed48b8fd4561ddf2129db6a1e0b65
---
 nova/compute/manager.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 11344830f..9971be012 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1286,8 +1286,7 @@ class ComputeManager(manager.SchedulerDependentManager):
 
         admin_pass = (rescue_password if rescue_password else
                       utils.generate_password(FLAGS.password_length))
-        self.db.instance_update(context, instance['uuid'],
-                                dict(admin_pass=admin_pass))
+        instance['admin_pass'] = admin_pass
 
         network_info = self._get_instance_nw_info(context, instance)
         image_meta = _get_image_meta(context, instance['image_ref'])
-- 
cgit