kitchen-lxc 0.0.1.beta2 → 0.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 418715ee25b2e76bc05bdb529246672c285a4a03
+  data.tar.gz: b6e88dd94c7188b5c42dd26b43bf5f918ffa9aaf
+SHA512:
+  metadata.gz: 4a257a729d514716151fc6f81ea5efb460dcf640daf59624828d2afafa9009dc5aac6fbe34c91df51c5c32a10cd3eaf005ed8426d3b568a32a17bc7a637871c0
+  data.tar.gz: 0733d4006ea2409a31a359899349f4f932c54f86da727b45e6cc234aeaf2fd6caec644a77c4a36fdfe4a4a95e3c8eff267945bcdf81c143373fed2d7f9f1b836

data/Gemfile

@@ -1,6 +1,3 @@
 source "https://rubygems.org"
 
-# Specify your gem"s dependencies in kitchen-lxc.gemspec
 gemspec
-
-gem "test-kitchen", :git => "git://github.com/opscode/test-kitchen.git", :branch => "1.0"

data/README.md

@@ -1,10 +1,13 @@
 # Kitchen LXC
 
 The LXC driver for the Chef convergence integration test harness,
-[Test Kitchen](https://github.com/opscode/test-kitchen/tree/1.0).
+[Test Kitchen](https://github.com/test-kitchen).
 
-Kitchen LXC creates a clone of a "base" LXC container to run a test
-suite.
+Kitchen LXC creates an ephemeral clone of a "base" LXC container to
+run a test suite.
+
+You may want to use the
+[Docker driver](https://github.com/portertech/kitchen-docker).
 
 ## Installation
 
@@ -33,28 +36,11 @@ 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`
@@ -72,38 +58,19 @@ platforms:
 ```
 
 ```
-$ bundle exec kitchen create
------> Starting Kitchen
------> Creating <default-ubuntu>
-       [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>
-       [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)
+$ sudo kitchen create default
+-----> Starting Kitchen (v1.0.0.beta.4)
+-----> Creating <default-ubuntu_1204>
+       Finished creating <default-ubuntu_1204> (0m4.50s).
+-----> Kitchen is finished. (0m4.54s)
+$ sudo kitchen destroy default
+-----> Starting Kitchen (v1.0.0.beta.4)
+-----> Destroying <default-ubuntu_1204>
+       Finished destroying <default-ubuntu_1204> (0m0.32s).
+-----> Kitchen is finished. (0m0.35s)
+$ sudo kitchen list
+Instance        Driver  Provisioner  Last Action
+default-ubuntu_1204  Lxc     Chef Solo    <Not Created>
 ```
 
 ## Contributing
@@ -114,10 +81,4 @@ $ bundle exec kitchen destroy
 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.beta2"
+  gem.version       = "0.0.1"
   gem.authors       = ["Sean Porter"]
   gem.email         = ["portertech@gmail.com"]
   gem.description   = "LXC driver for Test Kitchen"
@@ -9,8 +9,8 @@ Gem::Specification.new do |gem|
   gem.license       = "MIT"
   gem.has_rdoc      = false
 
-  gem.add_dependency("test-kitchen", ">= 1.0.0.alpha.6")
-  gem.add_dependency("lxc-awesome-ephemeral", ">= 0.0.1.beta1")
+  gem.add_dependency("test-kitchen", ">= 1.0.0.beta.4")
+  gem.add_dependency("elecksee", ">= 1.0.14")
 
   gem.add_development_dependency("rake")
 

data/lib/kitchen/driver/lxc.rb

@@ -1,5 +1,7 @@
-require "securerandom"
 require "kitchen"
+require "elecksee/ephemeral"
+
+::Lxc.use_sudo = true
 
 module Kitchen
 
@@ -7,66 +9,36 @@ module Kitchen
 
     class Lxc < Kitchen::Driver::SSHBase
 
-      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
+      default_config :use_sudo, true
+      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)
-        state[:overlay] = config[:overlay] if config[:overlay]
-        start_container(state)
-        state[:hostname] = container_ip(state)
-        wait_for_sshd(state[:hostname])
+      default_config :original do |driver|
+        driver[:base_container]
       end
 
-      def destroy(state)
-        destroy_container(state) if state[:container_id]
-      end
+      no_parallel_for :create
 
-      protected
+      def create(state)
+        container = ::Lxc::Ephemeral.new(config.to_hash)
+        container.create!
 
-      def start_container(state)
-        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
+        state[:container_name] = container.name
 
-      def destroy_container(state)
-        cmd = "lxc-awesome-ephemeral -c -o #{config[:base_container]} -n #{state[:container_id]}"
-        cmd << " -z #{state[:overlay]}" if state[:overlay]
-        run_command(cmd)
-      end
+        lxc = ::Lxc.new(state[:container_name])
+        lxc.start
 
-      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]
+        state[:hostname] = lxc.container_ip(10, true)
+        wait_for_sshd(state[:hostname])
       end
 
-      def container_ip(state)
-        if config[:ipaddress]
-          return config[:ipaddress]
-        else
-          30.times do
-            leases = ::File.readlines(dhcp_lease_file).map { |line| line.split(" ") }
-            leases.each do |lease|
-              return lease[2] if lease.include?(state[:container_id])
-            end
-            sleep 3
-          end
+      def destroy(state)
+        if state[:container_name]
+          lxc = ::Lxc.new(state[:container_name])
+          lxc.destroy
         end
-        raise ActionFailed, "Could not determine IP address for LXC container '#{state[:container_id]}'"
       end
+
     end
 
     class LXC < Lxc; end

metadata

@@ -1,64 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-lxc
 version: !ruby/object:Gem::Version
-  prerelease: 6
-  version: 0.0.1.beta2
+  version: 0.0.1
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
+  name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.6
+        version: 1.0.0.beta.4
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.6
-  name: test-kitchen
+        version: 1.0.0.beta.4
 - !ruby/object:Gem::Dependency
-  type: :runtime
+  name: elecksee
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1.beta1
+        version: 1.0.14
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1.beta1
-  name: lxc-awesome-ephemeral
+        version: 1.0.14
 - !ruby/object:Gem::Dependency
-  type: :development
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
 description: LXC driver for Test Kitchen
 email:
 - portertech@gmail.com
@@ -77,27 +70,27 @@ files:
 homepage: https://github.com/portertech/kitchen-lxc
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: LXC driver for Test Kitchen
 test_files:
 - test/lxc_driver_tests.rb
+has_rdoc: false