diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-03-17 11:24:24 -0500 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-03-17 11:24:24 -0500 |
| commit | d6ae8e4c2f6011497b1db23fcbafb23b663f924d (patch) | |
| tree | 1380c83cff9e94119b2d39c4768b814a8505ac67 | |
| parent | 1ffef31839f3c1f4386d5df834af6d53483c09ed (diff) | |
| download | nova-d6ae8e4c2f6011497b1db23fcbafb23b663f924d.tar.gz nova-d6ae8e4c2f6011497b1db23fcbafb23b663f924d.tar.xz nova-d6ae8e4c2f6011497b1db23fcbafb23b663f924d.zip | |
Foo
| -rw-r--r-- | nova/compute/manager.py | 1 | ||||
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 6b784f1e3..186b6f6a5 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -544,6 +544,7 @@ class ComputeManager(manager.Manager): vcpus=instance_type['vcpus'], local_gb=instance_type['local_gb'])) + instance_ref = self.db.instance_get(context, instance_id) self.driver.finish_resize(instance_ref, disk_info) self.db.migration_update(context, migration_id, diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index b6bcc60ea..326d43aa9 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -67,7 +67,7 @@ class VMOps(object): self._start(instance, vm_ref) def finish_resize(self, instance, disk_info): - vdi_uuid = self._vmops.link_disks(instance, disk_info['base_copy'], + vdi_uuid = self.link_disks(instance, disk_info['base_copy'], disk_info['cow']) vm_ref = self._create_vm(instance, vdi_uuid) self.resize_instance(instance, vdi_uuid) |