Merge pull request #101 from trevor-vaughan/cleanup_failed_provisioning

Rearrange the cleanup handling

Author: genebean

lib/beaker-rspec/spec_helper.rb

@@ -47,15 +47,24 @@
 
   # Configure all nodes in nodeset
   c.setup([fresh_nodes, '--hosts', nodesetfile, keyfile, debug, color, options_file].flatten.compact)
-  c.provision
-  c.validate
-  c.configure
 
   trap "SIGINT" do
     c.cleanup
     exit!(1)
   end
 
+  begin
+    c.provision
+  rescue StandardError => e
+    logger.error(e)
+    logger.info(e.backtrace)
+    c.cleanup
+    exit!(1)
+  end
+
+  c.validate
+  c.configure
+
   # Destroy nodes if no preserve hosts
   c.after :suite do
     case options[:destroy]