Adding real instance cleanup

1 files changed, 14 insertions, 3 deletions

diff --git a/cloudmasterd/lib/cloudmasterd.rb b/cloudmasterd/lib/cloudmasterd.rb
index 88223c9..6cd9696 100644
--- a/cloudmasterd/lib/cloudmasterd.rb
+++ b/cloudmasterd/lib/cloudmasterd.rb
@@ -148,10 +148,21 @@ module Cloudmasterd::Controllers
     def destroy(name)
       puts "Destroying image #{name}"
       Machine.find(:all, :conditions => "name = '#{name}'").each do |machine|
-        if machine.state == "Missing" then
-          # Don't try and remotely clean up anything, just remove the DB record
-          machine.destroy
+        # If the machine is missing, don't bother remotely trying to cleanup
+        unless machine.state == "Missing" then
+          # Destroy the virtual machine
+          `func "#{machine.cloud}" call command run "virsh destroy #{machine.name}"`
+          `func "#{machine.cloud}" call command run "virsh undefine #{machine.name}"`
+
+          # Remove the auto start file if it exists
+          `func "#{machine.cloud}" call command run "rm -rf /etc/xen/auto/#{machine.name}"`
+
+          # Remove the image file
+          `func "#{machine.cloud}" call command run "rm -rf /images/#{machine.name}-disk0"`
         end
+
+        # Delete the DB record
+        machine.destroy
       end
       redirect R(Cloud)
     end