Ensure script cleanup is done in chroot

2023-11-16 18:27:23 -05:00 · 2023-11-16 18:27:23 -05:00 · c1c22c81e7
parent 712a50ca27
commit c1c22c81e7
1 changed files with 7 additions and 1 deletions
--- a/api-daemon/pvcapid/vmbuilder.py
+++ b/api-daemon/pvcapid/vmbuilder.py
@ -681,9 +681,15 @@ def create_vm(

    def fail_clean(celery, msg, exception=ProvisioningError):
        try:
-            vm_builder.cleanup()
+            with chroot(temp_dir):
+                vm_builder.cleanup()
+        except Exception:
+            # We're already failing, do the best we can
+            pass
+        try:
            general_cleanup()
        except Exception:
+            # We're already failing, do the best we can
            pass
        fail(celery, msg, exception=exception)