diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-02-25 13:59:26 -0800 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-02-25 13:59:26 -0800 |
| commit | 6f72ba3d88f31e6336725bcffe47fa2bd5f1dba0 (patch) | |
| tree | 5c558286c6926a0d7edfa07fc529f5ee2e5b1653 /nova/compute | |
| parent | eab99bbcdb02aa9bd330b01f2d27a297ab6b7f2e (diff) | |
| parent | f3efbaa3d10997038e32c6e5e53dfef117236247 (diff) | |
merge with zones2 fixes and trunk
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 7eb5eed16..ebe1ce6f0 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -511,9 +511,7 @@ class ComputeManager(scheduler_manager.SchedulerDependentManager): instance_ref = self.db.instance_get(context, migration_ref['instance_id']) - # this may get passed into the following spawn instead - new_disk_info = self.driver.attach_disk(instance_ref, disk_info) - self.driver.spawn(instance_ref, disk=new_disk_info) + self.driver.finish_resize(instance_ref, disk_info) self.db.migration_update(context, migration_id, {'status': 'finished', }) |