diff options
| author | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2011-07-28 17:18:59 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-07-28 17:18:59 +0000 |
| commit | 340c516817abdb93bcfe5830fee90b1e16ccda3d (patch) | |
| tree | fdbe6120c47ae98d28d3a5fa51a79ece9c41f06a | |
| parent | 5072bce5102d94ed07b3475d0ace107d45b86a6c (diff) | |
| parent | 129088abe597af9e6fa224378cca1a95dfe6cfe3 (diff) | |
| download | nova-340c516817abdb93bcfe5830fee90b1e16ccda3d.tar.gz nova-340c516817abdb93bcfe5830fee90b1e16ccda3d.tar.xz nova-340c516817abdb93bcfe5830fee90b1e16ccda3d.zip | |
Make network_info truly optional
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 2640e1ba2..77efe1bf0 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -471,7 +471,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) @@ -853,7 +853,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: |