diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-08-23 22:00:42 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-08-23 22:00:42 -0400 |
| commit | 410edd037486a2e09bfc8276adc2a25459e2e2c8 (patch) | |
| tree | a663ec3c2a9a6d659256a3c5ab084cf7a977edb3 /nova/compute | |
| parent | 309a264db6c952081f2e85db21efc719596240a6 (diff) | |
| download | nova-410edd037486a2e09bfc8276adc2a25459e2e2c8.tar.gz nova-410edd037486a2e09bfc8276adc2a25459e2e2c8.tar.xz nova-410edd037486a2e09bfc8276adc2a25459e2e2c8.zip | |
cleanup
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 1 | ||||
| -rw-r--r-- | nova/compute/manager.py | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 0ac38a428..06f09f9a6 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1053,7 +1053,6 @@ class API(base.Base): context, instance_id, params=rebuild_params) - return rebuild_params @scheduler_api.reroute_compute("revert_resize") def revert_resize(self, context, instance_id): diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 40cd09044..d3a4c6f88 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -547,8 +547,8 @@ class ComputeManager(manager.SchedulerDependentManager): bd_mapping = self._setup_block_device_mapping(context, instance_id) # pull in new password here since the original password isn't in the db - new_pass = kwargs.get('new_pass') - instance_ref.admin_pass = new_pass + instance_ref.admin_pass = kwargs.get('new_pass', + utils.generate_password(FLAGS.password_length)) self.driver.spawn(context, instance_ref, network_info, bd_mapping) |