diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-03-17 10:03:47 -0500 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-03-17 10:03:47 -0500 |
| commit | aa13754d04c17ae9985017e22ae4f68916bc2781 (patch) | |
| tree | 5d9d8fc7f7f2950a19d490cdc2c2e45e640677c5 /nova | |
| parent | 3c0ae08b71c860383c215fa30c36693fd80f34c2 (diff) | |
Foo
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/compute/manager.py | 1 | ||||
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 3135d5801..b8c3c24cd 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -547,7 +547,6 @@ 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 9719e05b9..b5003f0f8 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -307,7 +307,7 @@ class VMOps(object): template_vdi_uuids = template_vm_ref = None try: # transfer the base copy - template_vm_ref, template_vdi_uuids = self._get_snapshot(instance) + template_vm_ref, template_vdi_uuids = selimage._get_snapshot(instance) base_copy_uuid = template_vdi_uuids['image'] vdi_ref, vm_vdi_rec = \ VMHelper.get_vdi_for_vm_safely(self._session, vm_ref) @@ -368,6 +368,7 @@ class VMOps(object): """Resize a running instance by changing it's RAM and disk size """ #TODO(mdietz): this will need to be adjusted for swap later #The new disk size must be in bytes + new_disk_size = str(instance.local_gb * 1024 * 1024 * 1024) LOG.debug(_("Resizing VDI %s for instance %s. Expanding to %sGB") % (vdi_uuid, instance.name, instance.local_gb)) |