diff options
| author | Jason Koelker <jason@koelker.net> | 2011-07-27 16:06:08 -0500 |
|---|---|---|
| committer | Jason Koelker <jason@koelker.net> | 2011-07-27 16:06:08 -0500 |
| commit | ae6801fa1fe3cd83b3c51d4f3a9a9a265fc49588 (patch) | |
| tree | 99670a5fe5d342505cc2c0fb950b90dd6346281f | |
| parent | 9b0979c43bcb9961dfd997a17eed307b1db17acd (diff) | |
default the paramater to None, not sure why it was required to begin with
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 4d8747852..1fba5a003 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -473,7 +473,7 @@ class VMOps(object): self._session, instance, template_vdi_uuids, image_id) finally: if template_vm_ref: - self._destroy(instance, template_vm_ref, None, + self._destroy(instance, template_vm_ref, shutdown=False, destroy_kernel_ramdisk=False) logging.debug(_("Finished snapshot and upload for VM %s"), instance) @@ -542,7 +542,7 @@ class VMOps(object): finally: if template_vm_ref: - self._destroy(instance, template_vm_ref, None + self._destroy(instance, template_vm_ref shutdown=False, destroy_kernel_ramdisk=False) # TODO(mdietz): we could also consider renaming these to something @@ -859,7 +859,7 @@ class VMOps(object): vm_ref = VMHelper.lookup(self._session, instance.name) return self._destroy(instance, vm_ref, network_info, shutdown=True) - def _destroy(self, instance, vm_ref, network_info, shutdown=True, + def _destroy(self, instance, vm_ref, network_info=None, shutdown=True, destroy_kernel_ramdisk=True): """Destroys VM instance by performing: |