summaryrefslogtreecommitdiffstats
path: root/nova/virt
diff options
context:
space:
mode:
Diffstat (limited to 'nova/virt')
-rw-r--r--nova/virt/xenapi/vmops.py3
-rw-r--r--nova/virt/xenapi_conn.py5
2 files changed, 3 insertions, 5 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index ea4b7899b..7d88876e4 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -106,7 +106,8 @@ class VMOps(object):
instance.ramdisk_id, user, project, ImageType.KERNEL_RAMDISK)
vm_ref = VMHelper.create_vm(self._session,
instance, kernel, ramdisk, pv_kernel)
- VMHelper.create_vbd(self._session, vm_ref, vdi_ref, 0, True)
+ VMHelper.create_vbd(session=self._session, vm_ref=vm_ref, vdi_ref=vdi_ref,
+ userdevice=0, bootable=True)
if network_ref:
VMHelper.create_vif(self._session, vm_ref,
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index cc43050b4..8c756a7e3 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -152,7 +152,7 @@ class XenAPIConnection(object):
"""List VM instances"""
return self._vmops.list_instances()
- def spawn(self, instance):
+ def spawn(self, instance, disk_info=None):
"""Create VM instance"""
self._vmops.spawn(instance)
@@ -164,9 +164,6 @@ class XenAPIConnection(object):
"""Resize a VM instance"""
raise NotImplementedError()
- def attach_disk(self, instance_ref):
-
-
def reboot(self, instance):
"""Reboot VM instance"""
self._vmops.reboot(instance)