summaryrefslogtreecommitdiffstats
path: root/nova/virt
diff options
context:
space:
mode:
authorCory Wright <cory.wright@rackspace.com>2011-03-08 14:35:53 +0000
committerCory Wright <cory.wright@rackspace.com>2011-03-08 14:35:53 +0000
commitb8a0fdca4df454a4d60df40d06ebd82bcc2ba3da (patch)
tree80d2f054ac3c8ecf93541d598c71d89e22ea048f /nova/virt
parent4937a1ec17beadb6e1737ac126adf68fd6dbf2c8 (diff)
* pep8 cleanups in migrations
* a few bugfixes
Diffstat (limited to 'nova/virt')
-rw-r--r--nova/virt/xenapi/vm_utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 150824400..604e8a4e0 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -324,7 +324,7 @@ class VMHelper(HelperBase):
kwargs = {'params': pickle.dumps(params)}
task = session.async_call_plugin('glance', 'upload_vhd', kwargs)
- session.wait_for_task(task, instance_id)
+ session.wait_for_task(task, instance.id)
@classmethod
def fetch_image(cls, session, instance_id, image, user, project,