diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-09 15:47:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-09 15:47:07 +0000 |
| commit | 8795f662a8ae00a459d4911be2e9756ed0f3a207 (patch) | |
| tree | 49b6aa8bdddd95a1f4fb3cadf942779a93c046b8 | |
| parent | 220ab5cfcbea8c500d45d3805c88f661730f7014 (diff) | |
| parent | dd45bf735c073c9fb59d1d420d2e47713d28577d (diff) | |
Merge "Fix setting admin_pass in rescue command"
| -rw-r--r-- | nova/compute/manager.py | 3 |
1 files changed, 1 insertions, 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']) |