kitchen-lxc 0.0.1.beta1 → 0.0.1.beta2

data/README.md

@@ -1,79 +1,109 @@
 # Kitchen LXC
 
-The LXC driver for the Chef convergence integration test harness, [Test Kitchen](https://github.com/opscode/test-kitchen/tree/1.0).
+The LXC driver for the Chef convergence integration test harness,
+[Test Kitchen](https://github.com/opscode/test-kitchen/tree/1.0).
+
+Kitchen LXC creates a clone of a "base" LXC container to run a test
+suite.
 
 ## Installation
 
-Add this line to your Chef cookbooks's Gemfile:
+Add this line to your Chef cookbook's Gemfile:
 
     gem 'kitchen-lxc'
 
 And then execute:
 
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install kitchen-lxc
+    $ bundle install
 
 ## Usage
 
 ### Configuration
 
+#### base_container
+The base LXC container to be cloned for each Test Kitchen suite.
+
+#### username
+The username used to login to the container.
+
+Defaults to "root".
+
+#### password
+The password used to login to the container.
+
+Defaults to "root".
+
+#### dhcp_lease_file
+The DHCP lease file used to determine the container IP address.
+
+Defaults to the first match for "/var/lib/misc/dnsmasq*leases".
+
+#### ipaddress
+You may specify an IP address for the container, within the
+10.0.3.0/24 subnet, instead of using DHCP.
+
+#### port
+The SSH port used to login to the container.
+
+Defaults to 22.
+
+#### overlay
+The directory to use for the rootfs overlay.
+
+Defaults to "/tmp".
+
+#### device
+The size (MB) of the block device for the rootfs overlay.
+
+### Example
+
 `.kitchen.local.yml`
 
 ```
+---
 driver_plugin: lxc
 
 platforms:
-  - name: distribution
-    driver_config:
-      base_container: "distribution-release" # your base container name
-      username: "foo" # defaults to "root"
-      password: "bar" # defaults to "root"
+- name: ubuntu_1204
+  driver_config:
+    base_container: ubuntu_1204 # your base container name
+    username: kitchen # defaults to "root"
+    password: kitchen # defaults to "root"
 ```
 
-### Example
-
 ```
-$ kitchen create
+$ bundle exec kitchen create
 -----> Starting Kitchen
 -----> Creating <default-ubuntu>
-       [lxc command] BEGIN (sudo lxc-clone -o ubuntu-1204 -n default-ubuntu-a5fb8a)
-       Tweaking configuration
-       Copying rootfs...
-       Updating rootfs...
-       'default-ubuntu-a5fb8a' created
-       [lxc command] END (0m6.17s)
-       [lxc command] BEGIN (sudo lxc-start -n default-ubuntu-a5fb8a -d)
-       [lxc command] END (0m0.01s)
-       [lxc command] BEGIN (sudo lxc-wait -n default-ubuntu-a5fb8a -s RUNNING)
-       [lxc command] END (0m1.05s)
-       Finished creating <default-ubuntu> (0m7.42s).
------> Creating <default-centos>
-       [lxc command] BEGIN (sudo lxc-clone -o centos-6 -n default-centos-58fced)
-       Tweaking configuration
-       Copying rootfs...
-       Updating rootfs...
-       'default-centos-58fced' created
-       [lxc command] END (0m6.68s)
-       [lxc command] BEGIN (sudo lxc-start -n default-centos-58fced -d)
-       [lxc command] END (0m0.02s)
-       [lxc command] BEGIN (sudo lxc-wait -n default-centos-58fced -s RUNNING)
-       [lxc command] END (0m1.05s)
-       Finished creating <default-centos> (0m13.92s).
------> Kitchen is finished. (0m21.45s)
-$ kitchen destroy
+       [kitchen::driver::lxc command] BEGIN (lxc-awesome-ephemeral -d -o tk-ubuntu-1204 -n default-ubuntu-a0c75e)
+       Setting up ephemeral container...
+       Starting up the container...
+       default-ubuntu-a0c75e is running
+       You connect with the command:
+           sudo lxc-console -n default-ubuntu-a0c75e
+       [kitchen::driver::lxc command] END (0m1.92s)
+       Finished creating <default-ubuntu> (0m4.98s).
+-----> Creating <stack-ubuntu>
+       [kitchen::driver::lxc command] BEGIN (lxc-awesome-ephemeral -d -o tk-ubuntu-1204 -n stack-ubuntu-cb87c2)
+       Setting up ephemeral container...
+       Starting up the container...
+       stack-ubuntu-cb87c2 is running
+       You connect with the command:
+           sudo lxc-console -n stack-ubuntu-cb87c2
+       [kitchen::driver::lxc command] END (0m1.91s)
+       Finished creating <stack-ubuntu> (0m4.99s).
+-----> Kitchen is finished. (0m9.99s)
+$ bundle exec kitchen destroy
 -----> Starting Kitchen
 -----> Destroying <default-ubuntu>
-       [lxc command] BEGIN (sudo lxc-destroy -n default-ubuntu-a5fb8a -f)
-       [lxc command] END (0m1.18s)
-       Finished destroying <default-ubuntu> (0m1.21s).
------> Destroying <default-centos>
-       [lxc command] BEGIN (sudo lxc-destroy -n default-centos-58fced -f)
-       [lxc command] END (0m1.14s)
-       Finished destroying <default-centos> (0m1.17s).
------> Kitchen is finished. (0m2.45s)
+       [kitchen::driver::lxc command] BEGIN (lxc-awesome-ephemeral -c -o tk-ubuntu-1204 -n default-ubuntu-a0c75e)
+       [kitchen::driver::lxc command] END (0m3.41s)
+       Finished destroying <default-ubuntu> (0m3.48s).
+-----> Destroying <stack-ubuntu>
+       [kitchen::driver::lxc command] BEGIN (lxc-awesome-ephemeral -c -o tk-ubuntu-1204 -n stack-ubuntu-cb87c2)
+       [kitchen::driver::lxc command] END (0m3.44s)
+       Finished destroying <stack-ubuntu> (0m3.52s).
+-----> Kitchen is finished. (0m7.03s)
 ```
 
 ## Contributing
@@ -83,3 +113,11 @@ $ kitchen destroy
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Authors
+
+Author:: Sean Porter (<portertech@gmail.com>)
+
+Author:: Bryan W. Berry (<bryan.berry@gmail.com>)
+
+See LICENSE.txt for licensing details

data/kitchen-lxc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "kitchen-lxc"
-  gem.version       = "0.0.1.beta1"
+  gem.version       = "0.0.1.beta2"
   gem.authors       = ["Sean Porter"]
   gem.email         = ["portertech@gmail.com"]
   gem.description   = "LXC driver for Test Kitchen"
@@ -9,7 +9,8 @@ Gem::Specification.new do |gem|
   gem.license       = "MIT"
   gem.has_rdoc      = false
 
-  gem.add_dependency("test-kitchen", ">= 1.0.0.alpha.0")
+  gem.add_dependency("test-kitchen", ">= 1.0.0.alpha.6")
+  gem.add_dependency("lxc-awesome-ephemeral", ">= 0.0.1.beta1")
 
   gem.add_development_dependency("rake")
 

data/lib/kitchen/driver/lxc.rb

@@ -7,62 +7,69 @@ module Kitchen
 
     class Lxc < Kitchen::Driver::SSHBase
 
-      default_config :use_sudo,        true
-      default_config :dhcp_lease_file, "/var/lib/misc/dnsmasq.leases"
+      no_parallel_for :create
+
+      default_config :use_sudo,        false
+      default_config :dhcp_lease_file, Dir["/var/lib/misc/dnsmasq*leases"][0]
       default_config :port,            "22"
       default_config :username,        "root" # most LXC templates use this
       default_config :password,        "root" # most LXC templates use this
 
       def create(state)
         state[:container_id] = instance.name + "-" + ::SecureRandom.hex(3)
-        clone_container(state)
+        state[:overlay] = config[:overlay] if config[:overlay]
         start_container(state)
         state[:hostname] = container_ip(state)
         wait_for_sshd(state[:hostname])
       end
 
       def destroy(state)
-        if state[:container_id]
-          destroy_container(state)
-        end
+        destroy_container(state) if state[:container_id]
       end
 
       protected
 
-      def clone_container(state)
-        run_command("lxc-clone -o #{config[:base_container]} -n #{state[:container_id]}")
-      end
-
       def start_container(state)
-        run_command("lxc-start -n #{state[:container_id]} -d")
-        run_command("lxc-wait -n #{state[:container_id]} -s RUNNING")
+        cmd = "lxc-awesome-ephemeral -d -o #{config[:base_container]} -n #{state[:container_id]}"
+        [:device, :ipaddress, :netmask, :gateway, :key].each do |opt|
+          unless config[opt].nil?
+            cmd << " --#{opt} #{config[opt]}"
+          end
+        end
+        cmd << " -z #{state[:overlay]}" if state[:overlay]
+        run_command(cmd)
       end
 
       def destroy_container(state)
-        run_command("lxc-destroy -n #{state[:container_id]} -f")
+        cmd = "lxc-awesome-ephemeral -c -o #{config[:base_container]} -n #{state[:container_id]}"
+        cmd << " -z #{state[:overlay]}" if state[:overlay]
+        run_command(cmd)
+      end
+
+      def dhcp_lease_file
+        unless ::File.exists?(config[:dhcp_lease_file])
+          raise ActionFailed, "LXC DHCP lease file does not exist '#{config[:dhcp_lease_file]}'"
+        end
+        config[:dhcp_lease_file]
       end
 
       def container_ip(state)
-        if ::File.exists?(config[:dhcp_lease_file])
+        if config[:ipaddress]
+          return config[:ipaddress]
+        else
           30.times do
-            leases = ::File.readlines(config[:dhcp_lease_file]).map{ |line| line.split(" ") }
+            leases = ::File.readlines(dhcp_lease_file).map { |line| line.split(" ") }
             leases.each do |lease|
-              if lease.include?(state[:container_id])
-                return lease[2]
-              end
+              return lease[2] if lease.include?(state[:container_id])
             end
             sleep 3
           end
-        else
-          raise ActionFailed, "LXC DHCP lease file does not exist '#{config[:dhcp_lease_file]}'"
         end
         raise ActionFailed, "Could not determine IP address for LXC container '#{state[:container_id]}'"
       end
-
     end
 
     class LXC < Lxc; end
 
   end
-
 end

data/test/lxc_driver_tests.rb

@@ -7,15 +7,17 @@ require File.join(File.dirname(__FILE__), "..", "lib", "kitchen", "driver", "lxc
 describe Kitchen::Driver::Lxc do
 
   before do
-    @logger_output = StringIO.new
+    @base_container = ENV["BASE_CONTAINER"]
+    raise "You must set BASE_CONTAINER" unless @base_container
     driver_options = {
       :kitchen_root   => File.dirname(__FILE__),
-      :base_container => "ubuntu-1204"
+      :base_container => @base_container
     }
+    @logger_output = StringIO.new
     instance_options = {
       :logger   => Kitchen::Logger.new(:stdout => @logger_output),
       :suite    => Kitchen::Suite.new(:name => "test", :run_list => Array.new),
-      :platform => Kitchen::Platform.new(:name => "ubuntu-1204"),
+      :platform => Kitchen::Platform.new(:name => @base_container),
       :driver   => Kitchen::Driver::Lxc.new(driver_options)
     }
     @instance = Kitchen::Instance.new(instance_options)
@@ -23,9 +25,10 @@ describe Kitchen::Driver::Lxc do
 
   it "can clone a base lxc container" do
     @instance.create
-    @logger_output.string.must_match(/Finished creating <test-ubuntu-1204>/i)
+    container_name = "test-#{@base_container}"
+    @logger_output.string.must_match(/Finished creating <#{container_name}>/i)
     @instance.destroy
-    @logger_output.string.must_match(/Finished destroying <test-ubuntu-1204>/i)
+    @logger_output.string.must_match(/Finished destroying <#{container_name}>/i)
   end
 
 end

metadata

@@ -2,14 +2,14 @@
 name: kitchen-lxc
 version: !ruby/object:Gem::Version
   prerelease: 6
-  version: 0.0.1.beta1
+  version: 0.0.1.beta2
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
@@ -18,15 +18,31 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.0
+        version: 1.0.0.alpha.6
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.0
+        version: 1.0.0.alpha.6
   name: test-kitchen
+- !ruby/object:Gem::Dependency
+  type: :runtime
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.1.beta1
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.1.beta1
+  name: lxc-awesome-ephemeral
 - !ruby/object:Gem::Dependency
   type: :development
   requirement: !ruby/object:Gem::Requirement