jamie-lxc 0.0.1.alpha1 → 0.0.1.alpha2

data/jamie-lxc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "jamie-lxc"
-  gem.version       = "0.0.1.alpha1"
+  gem.version       = "0.0.1.alpha2"
   gem.authors       = ["Sean Porter"]
   gem.email         = ["portertech@gmail.com"]
   gem.description   = "LXC driver for Jamie"

data/lib/jamie/driver/lxc.rb

@@ -24,7 +24,9 @@ module Jamie
       end
 
       def perform_destroy(instance, state)
-        destroy_container(state)
+        if state["container_id"]
+          destroy_container(state)
+        end
       end
 
       protected
@@ -44,7 +46,7 @@ module Jamie
 
       def container_ip(state)
         if ::File.exists?(config["dhcp_lease_file"])
-          10.times do
+          20.times do
             leases = ::File.readlines(config["dhcp_lease_file"]).map{ |line| line.split(" ") }
             leases.each do |lease|
               if lease.include?(state["container_id"])

data/test/lxc_driver_tests.rb

@@ -9,10 +9,10 @@ describe Jamie::Driver::Lxc do
     suite = Jamie::Suite.new("name" => "test", "run_list" => Array.new)
     config = {
       "jamie_root" => File.dirname(__FILE__),
-      "base_container" => "iac-testing"
+      "base_container" => "ubuntu-1204"
     }
-    driver = Jamie::Driver::LXC.new(config)
-    platform = Jamie::Platform.new("name" => "ubuntu-12.04", "driver" => driver)
+    driver = Jamie::Driver::Lxc.new(config)
+    platform = Jamie::Platform.new("name" => "ubuntu-1204", "driver" => driver)
     @instance = Jamie::Instance.new(suite, platform)
   end
 

metadata

@@ -2,7 +2,7 @@
 name: jamie-lxc
 version: !ruby/object:Gem::Version
   prerelease: 6
-  version: 0.0.1.alpha1
+  version: 0.0.1.alpha2
 platform: ruby
 authors:
 - Sean Porter