diff options
| author | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2010-12-15 17:35:56 +0000 |
|---|---|---|
| committer | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2010-12-15 17:35:56 +0000 |
| commit | 9308d57ee06baab7eda304d0456544d1f9e587f0 (patch) | |
| tree | f333f33cb35c39d0104b06a7c2e80d925ae0e746 | |
| parent | eaf463e4cc15820a5a8b91a31266fee02438c2c9 (diff) | |
final cleanup
| -rw-r--r-- | nova/compute/api.py | 2 | ||||
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 1 | ||||
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 2 | ||||
| -rw-r--r-- | plugins/xenapi/etc/xapi.d/plugins/objectstore | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 1f54a4f96..a9f301d4d 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -78,7 +78,7 @@ class ComputeAPI(base.Base): if (kernel_id == str(FLAGS.null_kernel)): kernel_id = None ramdisk_id = None - logging.debug("Creating a raw instance (no kernel and ramdisk) - Paravirtualization:%s" %str(pv_kernel)) + logging.debug("Creating a raw instance") # Make sure we have access to kernel and ramdisk (as long as we want them) if (kernel_id!=None): diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index 2f8e19128..2e0f957a5 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -190,7 +190,6 @@ class VMHelper(): args['vdi-ref']=vdi_ref #TODO: Call proper function in plugin task = yield session.async_call_plugin('objectstore', fn, args) - logging.debug("Waiting for task completion") pv_str=yield session.wait_for_task(task) if pv_str.lower() == 'true': pv=True diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 17379e9f2..d00d58c80 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -59,7 +59,7 @@ class VMOps(object): project = AuthManager().get_project(instance.project_id) #if kernel is not present we must download a raw disk if (instance.kernel_id): - disk_image_tye=1 + disk_image_type=1 else: disk_image_type=2 vdi_uuid = yield VMHelper.fetch_image(self._session, diff --git a/plugins/xenapi/etc/xapi.d/plugins/objectstore b/plugins/xenapi/etc/xapi.d/plugins/objectstore index c78f0b1d8..e17f1ba13 100644 --- a/plugins/xenapi/etc/xapi.d/plugins/objectstore +++ b/plugins/xenapi/etc/xapi.d/plugins/objectstore @@ -101,7 +101,7 @@ def get_vdi_(proto, netloc, url_path, username, password, add_partition,raw_imag if (add_partition and not raw_image): write_partition(virtual_size, dest) - offset = (add_partition and MBR_SIZE_BYTES and not raw_image) or 0 + offset = (add_partition and not raw_image and MBR_SIZE_BYTES) or 0 get(proto, netloc, url_path, username, password, dest, offset) |