Deployment failures will now remove the disk image

3 files changed, 10 insertions, 3 deletions

diff --git a/kvm.write b/kvm.write
index 9a6be135..4f877c22 100755
--- a/kvm.write
+++ b/kvm.write
@@ -68,6 +68,7 @@ class KvmPlusSshWriteExtension(morphlib.writeexts.WriteExtension):
         except BaseException:
             sys.stderr.write('Error deploying to libvirt')
             os.remove(raw_disk)
+            cliapp.ssh_runcmd(ssh_host, ['rm', '-f', vm_path])
             raise
         else:
             os.remove(raw_disk)
diff --git a/rawdisk.write b/rawdisk.write
index a74d6905..8723ac0c 100755
--- a/rawdisk.write
+++ b/rawdisk.write
@@ -46,8 +46,14 @@ class RawDiskWriteExtension(morphlib.writeexts.WriteExtension):
         if os.path.isfile(location):
             self.upgrade_local_system(location, temp_root)
         else:
-            self.create_local_system(temp_root, location)
-            self.status(msg='Disk image has been created at %s' % location)
+            try:
+                self.create_local_system(temp_root, location)
+                self.status(msg='Disk image has been created at %s' % location)
+            except Exception:
+                os.remove(location)
+                self.status(msg='Failure to create disk image at %s' %
+                                 location)
+                raise
 
     def upgrade_local_system(self, raw_disk, temp_root):
         mp = self.mount(raw_disk)
diff --git a/virtualbox-ssh.write b/virtualbox-ssh.write
index 2374db31..f18ef804 100755
--- a/virtualbox-ssh.write
+++ b/virtualbox-ssh.write
@@ -76,10 +76,10 @@ class VirtualBoxPlusSshWriteExtension(morphlib.writeexts.WriteExtension):
         except BaseException:
             sys.stderr.write('Error deploying to VirtualBox')
             os.remove(raw_disk)
+            cliapp.ssh_runcmd(ssh_host, ['rm', '-f', vdi_path])
             raise
         else:
             os.remove(raw_disk)
-
         self.status(
             msg='Virtual machine %(vm_name)s has been created',
             vm_name=vm_name)