diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-03-15 18:48:17 -0500 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-03-15 18:48:17 -0500 |
| commit | 74987666f89b4d15ffcf17b43b3752135ba08a65 (patch) | |
| tree | 43a84e6a634070e8d950de82ab3fcd5c491a8ebe | |
| parent | 67c871a257c684de3cb0f1416b1b2b6e9a99fe23 (diff) | |
| download | nova-74987666f89b4d15ffcf17b43b3752135ba08a65.tar.gz nova-74987666f89b4d15ffcf17b43b3752135ba08a65.tar.xz nova-74987666f89b4d15ffcf17b43b3752135ba08a65.zip | |
A few fixes
| -rw-r--r-- | nova/compute/manager.py | 2 | ||||
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 39b28f6a9..307c91650 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -541,7 +541,7 @@ class ComputeManager(manager.Manager): #after they're supported instance_type = self.db.instance_type_get_by_flavor_id(context, migration_ref['new_flavor_id']) - self.db.instance_update(context, instance_ref, + self.db.instance_update(context, instance_id, dict(memory_mb=instance_type['memory_mb'], vcpus=instance_type['vcpus'], local_gb=instance_type['local_gb'])) diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index d1aaf998f..119d6dba8 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -304,7 +304,7 @@ class VMOps(object): try: # transfer the base copy template_vm_ref, template_vdi_uuids = self._get_snapshot(instance) - base_copy_uuid = template_vdi_uuids[1] + base_copy_uuid = template_vdi_uuids['snap'] vdi_ref, vm_vdi_rec = \ VMHelper.get_vdi_for_vm_safely(self._session, vm_ref) cow_uuid = vm_vdi_rec['uuid'] @@ -319,7 +319,7 @@ class VMOps(object): self._session.wait_for_task(task, instance.id) # Now power down the instance and transfer the COW VHD - self._shutdown(instance, vm_ref, method='clean') + self._shutdown(instance, vm_ref) params = {'host': dest, 'vdi_uuid': cow_uuid, |