diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-04-30 18:43:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-04-30 18:43:24 +0000 |
| commit | 8fe6eda0b0d240f600f4c066d9cc3a136edffe34 (patch) | |
| tree | e8903e608e25a6f3ed9aee02b55991229ffc5537 | |
| parent | 9d7666e798b30f2f18020f1b49b1a724626a61f6 (diff) | |
| parent | 8af5639cbb4d9d1c7732a644329d5c6853a87981 (diff) | |
| download | nova-8fe6eda0b0d240f600f4c066d9cc3a136edffe34.tar.gz nova-8fe6eda0b0d240f600f4c066d9cc3a136edffe34.tar.xz nova-8fe6eda0b0d240f600f4c066d9cc3a136edffe34.zip | |
Merge "Pass instance to resize_disk() to fix exception"
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 2 | ||||
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index 084005a93..64aca60ac 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -452,7 +452,7 @@ class VMHelper(xenapi.HelperBase): session.call_plugin('glance', 'upload_vhd', kwargs) @classmethod - def resize_disk(cls, session, vdi_ref, instance_type): + def resize_disk(cls, session, instance, vdi_ref, instance_type): # Copy VDI over to something we can resize # NOTE(jerdfelt): Would be nice to just set vdi_ref to read/write sr_ref = cls.safe_find_sr(session) diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 2cbdeea0b..72d458cd0 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -744,6 +744,7 @@ class VMOps(object): # 3. Copy VDI, resize partition and filesystem, forget VDI, # truncate VHD new_ref, new_uuid = VMHelper.resize_disk(self._session, + instance, vdi_ref, instance_type) self._update_instance_progress(context, instance, |