diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-03-09 13:47:21 -0600 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-03-09 13:47:21 -0600 |
| commit | af894c1f171212e722f5d0b8042e2c205df2aee4 (patch) | |
| tree | 3b173bd609b53ee08b98ad847c229c526a4baad4 /nova/compute | |
| parent | 80a6dc5504378ae3d96829d96c02f50b9daa3029 (diff) | |
| parent | 52a623a2a991e0e091852f8db0317aae9898cf6c (diff) | |
Merge from 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 f85ad91df..399356a13 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -521,9 +521,7 @@ class ComputeManager(manager.Manager): 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', }) |