diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-03-16 11:54:10 -0500 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-03-16 11:54:10 -0500 |
| commit | dee86f53b0d1dccbc69d354b66ca7a4767e81d43 (patch) | |
| tree | b26e8bab1d7f086cfd13223b12e237cf751d5836 | |
| parent | 9cb503ae9d4112fa464f2284631ad1e24f8f7ce4 (diff) | |
| download | nova-dee86f53b0d1dccbc69d354b66ca7a4767e81d43.tar.gz nova-dee86f53b0d1dccbc69d354b66ca7a4767e81d43.tar.xz nova-dee86f53b0d1dccbc69d354b66ca7a4767e81d43.zip | |
tweak
| -rw-r--r-- | nova/compute/manager.py | 1 | ||||
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 307c91650..1587660a3 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -546,7 +546,6 @@ class ComputeManager(manager.Manager): vcpus=instance_type['vcpus'], local_gb=instance_type['local_gb'])) - self.driver.resize_instance(instance_ref, disk_info) 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 ebaa4a69a..483b0cb82 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -364,7 +364,7 @@ class VMOps(object): """Resize a running instance by changing it's RAM and disk size """ vm_ref = VMHelper.lookup(self._session, instance.name) vdi_ref = self._session.call_xenapi('VDI.get_by_uuid', vdi_uuid) - new_disk_size = instance.local_gb + new_disk_size = instance.local_gb * 1024 #TODO(mdietz): this will need to be adjusted for swap later task = self._session.call_xenapi('VDI.resize_online', vdi_ref, |