From f0a172ea8bcd5b241115210fcdbe33cf268ef051 Mon Sep 17 00:00:00 2001 From: Rick Harris Date: Fri, 2 Mar 2012 22:26:20 +0000 Subject: Cleanup swap in _create_vm undo Fixes bug 945198 Change-Id: I697fab1bbfdd45fc22d5490524e138c4f377bc58 --- nova/virt/xenapi/vmops.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 42c2c70b8..306e45891 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -312,8 +312,7 @@ class VMOps(object): ramdisk_file=ramdisk_file) def undo_create_vm(): - self._shutdown(instance, vm_ref) - self._destroy_vm(instance, vm_ref) + self._destroy(instance, vm_ref, network_info) undo_mgr.undo_with(undo_create_vm) return vm_ref -- cgit