diff options
| author | Josh Kearney <josh.kearney@rackspace.com> | 2011-01-18 17:59:26 -0600 |
|---|---|---|
| committer | Josh Kearney <josh.kearney@rackspace.com> | 2011-01-18 17:59:26 -0600 |
| commit | bb727b7032104d3d3966108d846dd3e5b8a1a37d (patch) | |
| tree | 4322139aa9343e4565157152ce5d3d3aa0237f6d /nova | |
| parent | 2b2f08dc1dfe1b55433c9122d7d42a480cdb5e67 (diff) | |
Fix merge conflict
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index 9600584b4..5f5ac254d 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -329,7 +329,7 @@ class VMHelper(HelperBase): #let the plugin copy the correct number of bytes args['image-size'] = str(vdi_size) task = session.async_call_plugin('glance', fn, args) - filename = session.wait_for_task(instance_id, task) + filename = session.wait_for_task(task, instance_id) #remove the VDI as it is not needed anymore session.get_xenapi().VDI.destroy(vdi) LOG.debug(_("Kernel/Ramdisk VDI %s destroyed"), vdi) |