diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-02-10 13:42:57 -0600 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-02-10 13:42:57 -0600 |
| commit | d8a7a76cd4fd22a6ad9fc1a7b879a8dbffcede5f (patch) | |
| tree | c8c13c9d3291f2f531f946e8718b3ae0f4116a82 /nova/compute | |
| parent | 5ed3abd0c689517db7a76e19c5b44fa4cc5d811f (diff) | |
| download | nova-d8a7a76cd4fd22a6ad9fc1a7b879a8dbffcede5f.tar.gz nova-d8a7a76cd4fd22a6ad9fc1a7b879a8dbffcede5f.tar.xz nova-d8a7a76cd4fd22a6ad9fc1a7b879a8dbffcede5f.zip | |
Some more cleanup
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index ac09f7c8c..54c3412f4 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -429,7 +429,8 @@ class ComputeManager(manager.Manager): self.db.migration_update(context, migration_id, { 'status': 'post-migrating', }) - # This is where we would update the VM record after resizing + #TODO(mdietz): This is where we would update the VM record + #after resizing service = self.db.service_get_by_host_and_topic(context, migration_ref['dest_host'], FLAGS.compute_topic) @@ -449,8 +450,8 @@ class ComputeManager(manager.Manager): migration_ref['instance_id']) # this may get passed into the following spawn instead - self.driver.attach_disk(context, instance_ref) - self.driver.spawn(context, instance_ref, preexisting=True) + disk_info = self.driver.attach_disk(context, instance_ref) + self.driver.spawn(context, instance_ref, disk_info=disk_info) self.db.migration_update(context, migration_id, {'status': 'finished', }) |