Merge "Disable libguestfs' default atexit handlers."

nova/tests/fakeguestfs.py

@@ -17,7 +17,7 @@
 
 class GuestFS(object):
 
-    def __init__(self):
+    def __init__(self, close_on_exit=True):
         self.drives = []
         self.running = False
         self.closed = False

nova/virt/disk/vfs/guestfs.py

@@ -108,7 +108,7 @@ class VFSGuestFS(vfs.VFS):
     def setup(self):
         LOG.debug(_("Setting up appliance for %(imgfile)s %(imgfmt)s") %
                   {'imgfile': self.imgfile, 'imgfmt': self.imgfmt})
-        self.handle = tpool.Proxy(guestfs.GuestFS())
+        self.handle = tpool.Proxy(guestfs.GuestFS(close_on_exit=False))
 
         try:
             self.handle.add_drive_opts(self.imgfile, format=self.imgfmt)