diff options
| author | Rick Harris <rconradharris@gmail.com> | 2012-03-02 22:26:20 +0000 |
|---|---|---|
| committer | Rick Harris <rconradharris@gmail.com> | 2012-03-02 22:26:20 +0000 |
| commit | f0a172ea8bcd5b241115210fcdbe33cf268ef051 (patch) | |
| tree | 203efd26e48793e904b73d03cfc4b36d8c5c3d6e | |
| parent | 8a530832c599f8866e98947976d74a5332d877af (diff) | |
| download | nova-f0a172ea8bcd5b241115210fcdbe33cf268ef051.tar.gz nova-f0a172ea8bcd5b241115210fcdbe33cf268ef051.tar.xz nova-f0a172ea8bcd5b241115210fcdbe33cf268ef051.zip | |
Cleanup swap in _create_vm undo
Fixes bug 945198
Change-Id: I697fab1bbfdd45fc22d5490524e138c4f377bc58
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 3 |
1 files changed, 1 insertions, 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 |