kitchen-lxd_cli 0.1.6 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b72ba2a22edb8adb3ee21e394eb133b532270a33
-  data.tar.gz: e758ef7199090d29672a0715b064bedcb6fe578e
+  metadata.gz: ad7b7dd864e7373d8f549d39ffc1ddbb58f3d929
+  data.tar.gz: 1ca5ed8845e1ed386320d5f228a7f22cd1bf38da
 SHA512:
-  metadata.gz: 1bc3eef0b7531b1fafe449d87618ee64015e8e184dbf194d23c2b8914c9f9a4ed5197c490aca7d27b9bf628d8dbb28e40db49b4505e320035643ec7c2806690f
-  data.tar.gz: b12cc296130ace2e4f5f55553da219972e8d3d70c0802007b4747efa55c8f3e8706598ec561c613ac1ef435282110be084d7dd6522302d6ba013e82112ad2f6f
+  metadata.gz: 67c2f7b009f1f3941674d9c15e08437cc18e7361309e90dfbc70941dcd54dc97f0f53e0489eb7a8cc13511ea013c04821164f9c6a2924e98364f225eab3547ed
+  data.tar.gz: 482187b180da0b2412be0e233fb4bbc4d8b7644a9c34da4cdee76e1d5d366eb011b666397c7d1ea9057fd31a9c806012f90c21eac535aad718dace56361d7d5e

data/README.md

@@ -6,7 +6,7 @@ A Test Kitchen Driver for LXD / LXC
 
 This is a test-kitchen driver for lxd, which controls lxc.  I named it LxdCli because this is my first plugin and I wanted to leave LXD driver name in case a more extensive project is put together.  Although I've since added a lot more features than I originally planned.
 
-I'm running lxd --version 0.20 on ubuntu 15.10.  NOTE:  Networking options will not work LXD 0.21, 0.22 [Github Issue](https://github.com/lxc/lxd/issues/1259)
+I'm running lxd --version 2.0.2 on ubuntu 16.04.  Image setup, Networking options, etc will not work prior to 2.0.0 [Github Issue](https://github.com/lxc/lxd/issues/1259), use kitchen_lxd_cli 0.x.x for lxd 0.x.  Only tested with ubuntu containers, pull requests are welcome.
 
 I started the project because I really like the idea of developing containers, but kitchen-lxc wouldn't work with my version.  I also tried docker but preferred how lxd is closer to a hypervisor virtual machine.  For instance kitchen-docker my recipes that had worked on virtual machies for mongodb, the service would not start when using docker.  I was able to get the service to start but liked the concept of system containers more than application containers.  Ultimately I was interested in LXD and there wasn't anything out there.  I was quickly able to get my mongodb recipe working.  I figured I'd clean things up, and some features and publish it.  Since then I've added numerous features, mainly with a focus on speeding up development of cookbooks, and exploring LXD.
 
@@ -52,8 +52,8 @@ driver:
   image_release: trusty
   profile: my_lxc_profile
   config:
-    limits.memory: 2G
-    limits.cpus: 2
+    limits.memory: 2GB
+    limits.cpu: 2
     boot.autostart: true
   domain_name: lxc
   ip_gateway: 10.0.3.1
@@ -205,12 +205,12 @@ Default is Nil.  See LXC documentation but a lxc profile can be specified.  Whic
 
 Default is Nil.  See LXC documentation but a lxc config container key/value can be specified.  [LXC Container Config Options](https://github.com/lxc/lxd/blob/master/specs/configuration.md#keyvalue-configuration-1).  Config options are passed to "lxc init" command.  A String or a Hash of key/value pairs is accepted.
 
-`config: "limits.memory=2G"`
+`config: "limits.memory=2GB"`
 
 ```yaml
 config:
-  limits.memory: 1G
-  limits.cpus: 2
+  limits.memory: 1GB
+  limits.cpu: 2
   boot.autostart: true
 ```
 
@@ -225,6 +225,8 @@ mount:
   mymount2:
     local_path: "/my/local/path"
     container_path: "/my/container/path"
+    # Attempts to create the local_path if it doesn't exist yet
+    create_source: true
 ```
 
 You can mount however many directories you like.  The kitchen-lxd_cli driver will run `lxc config device add <container> <name> disk <local_path>=<container_path>` 

data/kitchen-lxd_cli.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'test-kitchen', '~> 1.4.2'
+  spec.add_dependency 'test-kitchen', '~> 1.4'
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake'

data/lib/kitchen/driver/lxd_cli.rb

@@ -17,6 +17,7 @@
 # limitations under the License.
 
 require 'kitchen'
+require 'fileutils'
 
 module Kitchen
 
@@ -40,7 +41,7 @@ module Kitchen
       default_config :lxd_proxy_path, "#{ENV['HOME']}/.lxd_proxy"
       default_config :lxd_proxy_update, false
       default_config :username, "root"
-      
+
       required_config :public_key_path
 
       def create(state)
@@ -49,7 +50,7 @@ module Kitchen
         unless exists?
           image_name = create_image_if_missing
           profile_args = setup_profile_args if config[:profile]
-          config_args = setup_config_args if config[:config]
+          config_args = setup_config_args
           info("Initializing container #{instance.name}")
           run_lxc_command("init #{image_name} #{instance.name} #{profile_args} #{config_args}")
         end
@@ -73,7 +74,7 @@ module Kitchen
             info("Stopping container #{instance.name}")
             run_lxc_command("stop #{instance.name}")
           end
-          
+
           publish_image if config[:publish_image_before_destroy]
 
           unless config[:never_destroy]
@@ -117,9 +118,10 @@ module Kitchen
             image_os = config[:image_os] 
             image_os ||= image[:os]
             image_release = config[:image_release] 
-            image_release ||= image[:release]
-            debug("Ran command: lxd-images import #{image_os} #{image_release} --alias #{image_name}")
-            IO.popen("lxd-images import #{image_os} #{image_release} --alias #{image_name}", "w") { |pipe| puts pipe.gets rescue nil }
+            image_release ||= image[:release_num]
+            debug("Ran command: lxc image copy #{image_os}:#{image_release} local: --alias #{image_name}")
+            IO.popen("lxc image copy #{image_os}:#{image_release} local: --alias #{image_name}", "w") { |pipe| puts pipe.gets rescue nil }
+#            IO.popen("lxd-images import #{image_os} #{image_release} --alias #{image_name}", "w") { |pipe| puts pipe.gets rescue nil }
           end
 
           return image_name
@@ -130,20 +132,20 @@ module Kitchen
           if platform.downcase == "ubuntu"
             case release.downcase
             when "14.04", "1404", "trusty", "", nil
-              image = { :os => platform, :release => "trusty" }
+              image = { :os => platform, :release_name => "trusty", :release_num => '14.04' }
             when "14.10", "1410", "utopic"
-              image = { :os => platform, :release => "utopic" }
+              image = { :os => platform, :release_name => "utopic", :release_num => '14.10' }
             when "15.04", "1504", "vivid"
-              image = { :os => platform, :release => "vivid" }
+              image = { :os => platform, :release_name => "vivid", :release_num => '15.04' }
             when "15.10", "1510", "wily"
-              image = { :os => platform, :release => "wily" }
+              image = { :os => platform, :release_name => "wily", :release_num => '15.10'  }
             when "16.04", "1604", "xenial"
-              image = { :os => platform, :release => "xenial" }
+              image = { :os => platform, :release_name => "xenial", :release_num => '16.04'  }
             else
-              image = { :os => platform, :release => release }
+              image = { :os => platform, :release_name => release, :release_num => release  }
             end
           else
-            image = { :os => platform, :release => release }
+            image = { :os => platform, :release_name => release, :release_num => release }
           end
           return image
         end
@@ -198,7 +200,7 @@ module Kitchen
 
           if config[:ipv4]
             IO.popen("bash", "r+") do |p|
-              p.puts("echo -e \"lxc.network.type = veth\nlxc.network.name = eth0\nlxc.network.link = lxcbr0\nlxc.network.ipv4 = #{config[:ipv4]}\nlxc.network.ipv4.gateway = #{config[:ip_gateway]}\nlxc.network.flags = up\" | lxc config set #{instance.name} raw.lxc -")
+              p.puts("echo -e \"lxc.network.0.ipv4 = #{config[:ipv4]}\nlxc.network.0.ipv4.gateway = #{config[:ip_gateway]}\n\" | lxc config set #{instance.name} raw.lxc -")
               p.puts("exit")
             end
             arg_disable_dhcp = "&& lxc exec #{instance.name} -- sed -i 's/dhcp/manual/g' /etc/network/interfaces.d/eth0.cfg"
@@ -213,6 +215,8 @@ module Kitchen
           config_args = ""
           if config[:config].class == String
             config_args += " -c #{config[:config]}"
+          elsif config[:config].nil?
+            config_args += ""
           else
             config[:config].each do |key, value|
               config_args += " -c #{key}=#{value}"
@@ -242,7 +246,13 @@ module Kitchen
         def setup_mount_bindings
           config[:mount].each do |mount_name, mount_binding|
             if mount_name && mount_binding[:local_path] && mount_binding[:container_path]
-              run_lxc_command("config device add #{instance.name} #{mount_name} disk source=#{mount_binding[:local_path]} path=#{mount_binding[:container_path]}")
+              # eval is used here in case there's a need to pass instance.name as variable
+              host_path = eval('"'+ mount_binding[:local_path] +'"')
+              if ! File.directory?(mount_binding[:local_path]) && mount_binding[:create_source]
+                debug("Source path for the #{mount_name} doesn't exist, creating #{host_path}")
+                FileUtils.mkdir_p(host_path)
+              end
+              run_lxc_command("config device add #{instance.name} #{mount_name} disk source=#{host_path} path=#{mount_binding[:container_path]}")
             end
           end if config[:mount].class == Hash
         end
@@ -263,12 +273,19 @@ module Kitchen
             end if config[:ipv4] && dns_servers.length == 0
 
             if dns_servers.length > 0
-              wait_for_path("/etc/resolvconf/resolv.conf.d/base")
-              debug("Setting up the following dns servers via /etc/resolvconf/resolv.conf.d/base:")
-              debug(dns_servers.gsub("\n", ' '))
-              p.puts(" echo \"#{dns_servers.chomp}\" > /etc/resolvconf/resolv.conf.d/base")
-              wait_for_path("/run/resolvconf/interface")
-              p.puts("resolvconf -u")
+              if system "lxc exec #{instance.name} -- test -e /etc/redhat-release"
+                wait_for_path("/etc/resolv.conf")
+                debug("Setting up the following dns servers via /etc/resolv.conf:")
+                debug(dns_servers.gsub("\n", ' '))
+                p.puts(" echo \"#{dns_servers.chomp}\" > /etc/resolv.conf")
+              else
+                wait_for_path("/etc/resolvconf/resolv.conf.d/base")
+                debug("Setting up the following dns servers via /etc/resolvconf/resolv.conf.d/base:")
+                debug(dns_servers.gsub("\n", ' '))
+                p.puts(" echo \"#{dns_servers.chomp}\" > /etc/resolvconf/resolv.conf.d/base")
+                wait_for_path("/run/resolvconf/interface")
+                p.puts("resolvconf -u")
+              end
             end
 
             debug("Setting up /etc/hosts")
@@ -300,10 +317,12 @@ module Kitchen
           begin
             debug("Uploading public key...")
             unless config[:username] == "root"
-              `lxc file push #{config[:public_key_path]} #{instance.name}/home/#{config[:username]}/.ssh/authorized_keys 2> /dev/null`
+              home_path = '/home/'
             else
-              `lxc file push #{config[:public_key_path]} #{instance.name}/#{config[:username]}/.ssh/authorized_keys 2> /dev/null`
+              home_path = '/'
             end
+            authorized_keys_path = "#{home_path}#{config[:username]}/.ssh/authorized_keys"
+            `lxc file push #{config[:public_key_path]} #{instance.name}#{authorized_keys_path} 2> /dev/null && lxc exec #{instance.name} -- chown #{config[:username]}:#{config[:username]} #{authorized_keys_path}`
             break if $?.to_i == 0
             sleep 0.3
           end while true
@@ -362,7 +381,7 @@ module Kitchen
         def wait_for_ip_address
           info("Waiting for network to become ready")
           begin
-            lxc_info = `lxc info #{instance.name}`.match(/^[ ]+eth0:[\t]IPV4[\t]([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+).*$/)
+            lxc_info = `lxc info #{instance.name}`.match(/eth0:\tinet\t(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/)
             debug("Still waiting for IP Address...")
             lxc_ip = lxc_info.captures[0].to_s if lxc_info && lxc_info.captures
             break if lxc_ip && lxc_ip.length > 7

data/lib/kitchen/driver/lxd_cli_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for LxdCli Kitchen driver
-    LXD_CLI_VERSION = "0.1.6"
+    LXD_CLI_VERSION = "2.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-lxd_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 2.0.0
 platform: ruby
 authors:
 - Braden Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver for LXD