From dd6852992b9b63e0cfb387e20f1dae4490c7ead3 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Sun, 26 Feb 2012 14:44:20 -0500 Subject: [PATCH] Cleanup .rescue files in libvirt driver unrescue. Updates the libvirt driver so that it cleans up the .rescue image files in an unrescue operation. Fixes LP Bug #941591. Change-Id: Ib9f66834b8189912ec8408eeeb0d4ef35d41d39a --- nova/virt/libvirt/connection.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py index 5566076662d..c531c2cc813 100644 --- a/nova/virt/libvirt/connection.py +++ b/nova/virt/libvirt/connection.py @@ -41,6 +41,7 @@ import hashlib import functools +import glob import multiprocessing import os import shutil @@ -749,6 +750,10 @@ def unrescue(self, instance, network_info): unrescue_xml = libvirt_utils.load_file(unrescue_xml_path) libvirt_utils.file_delete(unrescue_xml_path) self.reboot(instance, network_info, xml=unrescue_xml) + rescue_files = os.path.join(FLAGS.instances_path, instance['name'], + "*.rescue") + for rescue_file in glob.iglob(rescue_files): + libvirt_utils.file_delete(rescue_file) @exception.wrap_exception() def poll_rebooting_instances(self, timeout):