kitchen-lxd_cli 0.1.0.beta → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90f808190b07d50dd9404d55a80c7e5bdf23fcb6
-  data.tar.gz: 6697d367bfd6ebcd472429ac3a63c156a65fc1bc
+  metadata.gz: 69c637b90cb10b7f5e7fbff0b2efd389f1d09c82
+  data.tar.gz: 2baf35c80ecd9804cb328b7ff2e0222a2a408a56
 SHA512:
-  metadata.gz: 760fcae5bb6f14e0d6df9067160f7e0676dc826b6c43dcefb46773fc4902df2a37dbccf8fd8afef5679820f3f662c216977af6d37869cb2ee1a382f645373348
-  data.tar.gz: 8217561471842586e3e39492cd6e348dd1c72913904653a30d5a8d620f4a19f0c444eb248b106f089a573a10c956ce67ce0800ca1ff600efb0ed2da86ef109d1
+  metadata.gz: c1a64dedb9835ac100b511e177f365d2d6276d657d3688bb50a551a3b138acce19ce1e8cbff63efcbcda12dcad299aa756d8012708bd1d9224007d881a01b5b1
+  data.tar.gz: 0f8665e9c1bfe62bf50021fa2520097618393764197619b0ffe8af0a94c44e25fb194ac434dfd716720587dca927072fc590442a21860d74af3553bbd6c3f833

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.swp

data/.kitchen/logs/kitchen.log

@@ -0,0 +1,29 @@
+I, [2015-11-01T00:01:20.462600 #7769]  INFO -- Kitchen: -----> Starting Kitchen (v1.4.2)
+E, [2015-11-01T00:01:20.462938 #7769] ERROR -- Kitchen: ------Exception-------
+E, [2015-11-01T00:01:20.462972 #7769] ERROR -- Kitchen: Class: Kitchen::UserError
+E, [2015-11-01T00:01:20.462994 #7769] ERROR -- Kitchen: Message: Kitchen YAML file /home/braden/kitchen-lxd_cli/.kitchen.yml does not exist.
+E, [2015-11-01T00:01:20.463013 #7769] ERROR -- Kitchen: ------Backtrace-------
+E, [2015-11-01T00:01:20.463031 #7769] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/test-kitchen-1.4.2/lib/kitchen/loader/yaml.rb:74:in `read'
+E, [2015-11-01T00:01:20.463049 #7769] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/test-kitchen-1.4.2/lib/kitchen/config.rb:145:in `data'
+E, [2015-11-01T00:01:20.463068 #7769] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/test-kitchen-1.4.2/lib/kitchen/config.rb:124:in `suites'
+E, [2015-11-01T00:01:20.463086 #7769] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/test-kitchen-1.4.2/lib/kitchen/config.rb:175:in `filter_instances'
+E, [2015-11-01T00:01:20.463103 #7769] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/test-kitchen-1.4.2/lib/kitchen/config.rb:134:in `build_instances'
+E, [2015-11-01T00:01:20.463124 #7769] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/test-kitchen-1.4.2/lib/kitchen/config.rb:110:in `instances'
+E, [2015-11-01T00:01:20.463142 #7769] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/test-kitchen-1.4.2/lib/kitchen/command.rb:115:in `filtered_instances'
+E, [2015-11-01T00:01:20.463160 #7769] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/test-kitchen-1.4.2/lib/kitchen/command.rb:145:in `parse_subcommand'
+E, [2015-11-01T00:01:20.463202 #7769] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/test-kitchen-1.4.2/lib/kitchen/command/action.rb:38:in `block in call'
+E, [2015-11-01T00:01:20.463232 #7769] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/2.1.0/benchmark.rb:279:in `measure'
+E, [2015-11-01T00:01:20.463250 #7769] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/test-kitchen-1.4.2/lib/kitchen/command/action.rb:37:in `call'
+E, [2015-11-01T00:01:20.463279 #7769] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/test-kitchen-1.4.2/lib/kitchen/cli.rb:56:in `perform'
+E, [2015-11-01T00:01:20.463298 #7769] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/test-kitchen-1.4.2/lib/kitchen/cli.rb:171:in `block (2 levels) in <class:CLI>'
+E, [2015-11-01T00:01:20.463317 #7769] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/thor-0.19.1/lib/thor/command.rb:27:in `run'
+E, [2015-11-01T00:01:20.463336 #7769] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/thor-0.19.1/lib/thor/invocation.rb:126:in `invoke_command'
+E, [2015-11-01T00:01:20.463366 #7769] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/test-kitchen-1.4.2/lib/kitchen/cli.rb:308:in `invoke_task'
+E, [2015-11-01T00:01:20.463387 #7769] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/thor-0.19.1/lib/thor.rb:359:in `dispatch'
+E, [2015-11-01T00:01:20.463407 #7769] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/thor-0.19.1/lib/thor/base.rb:440:in `start'
+E, [2015-11-01T00:01:20.463427 #7769] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/test-kitchen-1.4.2/bin/kitchen:13:in `block in <top (required)>'
+E, [2015-11-01T00:01:20.463447 #7769] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/test-kitchen-1.4.2/lib/kitchen/errors.rb:154:in `with_friendly_errors'
+E, [2015-11-01T00:01:20.463466 #7769] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/test-kitchen-1.4.2/bin/kitchen:13:in `<top (required)>'
+E, [2015-11-01T00:01:20.463485 #7769] ERROR -- Kitchen: /opt/chefdk/bin/kitchen:14:in `load'
+E, [2015-11-01T00:01:20.463523 #7769] ERROR -- Kitchen: /opt/chefdk/bin/kitchen:14:in `<main>'
+E, [2015-11-01T00:01:20.463543 #7769] ERROR -- Kitchen: ----------------------

data/:w

@@ -0,0 +1,176 @@
+# -*- encoding: utf-8 -*-
+#
+# Author:: Braden Wright (<braden.m.wright@gmail.com>)
+#
+# Copyright (C) 2015, Braden Wright
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'kitchen'
+
+module Kitchen
+
+  module Driver
+
+    # LxdCli driver for Kitchen.
+    #
+    # @author Braden Wright <braden.m.wright@gmail.com>
+#    class LxdCli < Kitchen::Driver::SSHBase
+    class LxdCli < Kitchen::Driver::Base
+      kitchen_driver_api_version 2
+
+      default_config :public_key_path do
+        [
+          File.expand_path('~/.ssh/id_rsa.pub'),
+          File.expand_path('~/.ssh/id_dsa.pub'),
+          File.expand_path('~/.ssh/identity.pub'),
+          File.expand_path('~/.ssh/id_ecdsa.pub')
+        ].find { |path| File.exist?(path) }
+      end
+      
+      required_config :public_key_path
+
+      def create(state)
+        if exists?
+          if running?
+            debug("#{instance.name} already exists, and is already running.  Nothing to do")
+          else
+            debug("#{instance.name} already exists, starting instead")
+            run_lxc_command("start #{instance.name}")
+          end
+        else
+          image_name = create_image_if_missing
+          profile = "-p #{config[:profile]}" if config[:profile]
+          lxc_config = "-c #{config[:config]}" if config[:config]
+          run_lxc_command("launch #{image_name} #{instance.name} #{profile} #{lxc_config}")
+        end
+        ip_address(state)
+        setup_ssh_access
+
+        conn(state).execute("touch testing")
+#        instance.transport.connection(state).login_command #fails
+      end
+
+      def destroy(state)
+        if exists?
+          if running?
+            run_lxc_command("stop #{instance.name}")
+          else
+            debug("#{instance.name} isn't running, just destroying instead")
+          end
+          run_lxc_command("delete #{instance.name}")
+        else
+          debug("#{instance.name} doesn't exist.  Nothing to do")
+        end
+        state.delete(:hostname)
+      end
+
+      private
+        def exists?
+          status = `lxc info #{instance.name} > /dev/null 2>&1 && echo $?`.chomp
+          if "#{status}" == "0"
+            debug("#{instance.name} exists")
+            return true
+          else
+            debug("#{instance.name} doesn't exist")
+            return false
+          end
+        end
+
+        def running?
+          status = `lxc info #{instance.name}`.match(/Status: ([a-zA-Z]+)[\n]/).captures[0].upcase
+          if status == "RUNNING"
+            debug("#{instance.name} is running")
+            return true
+          else
+            debug("#{instance.name} isn't running")
+            return false
+          end
+        end
+
+        def create_image_if_missing
+          image_name = config[:image_name] ||= instance.platform.name
+          status = `lxc image show #{image_name} > /dev/null 2>&1 && echo $?`.chomp
+          if "#{status}" == "0"
+            debug("Image #{image_name} exists")
+          else
+            debug("Image #{image_name} doesn't exist, creating now.")
+            image = get_ubuntu_image_info
+            image_os = config[:image_os] ||= image[:os]
+            image_release = config[:image_release] ||= image[:release]
+            debug("lxd-images import #{image_os} #{image_release} --alias #{image_name}")
+            run_local_command("lxd-images import #{image_os} #{image_release} --alias #{image_name}")
+          end
+          return image_name
+        end
+
+        def get_ubuntu_image_info
+          platform, release = instance.platform.name.split('-')
+          if platform.downcase == "ubuntu"
+            case release.downcase
+            when "14.04", "1404", "trusty", "", nil
+              image = { :os => platform, :release => "trusty" }
+            when "14.10", "1410", "utopic"
+              image = { :os => platform, :release => "utopic" }
+            when "15.04", "1504", "vivid"
+              image = { :os => platform, :release => "vivid" }
+            when "15.10", "1510", "wily"
+              image = { :os => platform, :release => "wily" }
+            when "16.04", "1604", "xenial"
+              image = { :os => platform, :release => "xenial" }
+            else
+              image = { :os => platform, :release => release }
+            end
+          else
+            image = { :os => platform, :release => release }
+          end
+          return image
+        end
+
+        def ip_address(state)
+          debug("start ip")
+          begin
+            lxc_info = `lxc info #{instance.name}`
+          end while (!lxc_info.match(/eth0:[\t]IPV[46][\t]([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+).*[\n]/))
+          conn(state).execute("-- ifconfig eth0 #{config[:ipv4]} up") if config[:ipv4]
+#          run_local_command("lxc exec #{instance.name} -- ifconfig eth0 #{config[:ipv4]} up") if config[:ipv4]
+          lxc_ip = config[:ipv4] ||= lxc_info.match(/eth0:[\t]IPV[46][\t]([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+).*[\n]/).captures[0].to_s
+          debug("found ip #{lxc_ip}")
+          state[:hostname] = lxc_ip
+          return lxc_ip
+        end
+
+        def setup_ssh_access
+          info("Copying public key from #{config[:public_key_path]} to #{instance.name}")
+          begin
+            sleep 0.3
+            status = `lxc file push #{config[:public_key_path]} #{instance.name}/root/.ssh/authorized_keys 2> /dev/null && echo $?`.chomp
+          end while ("#{status}" != "0")
+        end
+
+        def run_lxc_command(cmd)
+          # should be moved to transport and run_command used
+          #conn(state).run_lxc_command("stop #{instance.name}")
+          `lxc #{cmd}` if cmd
+        end
+
+        def run_local_command(cmd)
+          `#{cmd}` if cmd
+        end
+
+        def conn(state)
+          return instance.transport.connection(state)
+        end
+    end
+  end
+end

data/README.md

@@ -2,6 +2,8 @@
 
 A Test Kitchen Driver for LxdCli.
 
+At this point would NOT recommend using in Production.
+
 ## <a name="overview"></a> Overview
 
 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.
@@ -12,16 +14,43 @@ I started the project because I really like the idea of developing containers, b
 
 I AM VERY OPEN TO SUGGESTIONS/HELP.  As I mentioned I haven't written a kitchen driver or published any ruby gems before so I was hesitant to even release it.
 
+Minimal .kitchen.yml
 ```yaml
 ---
 driver:
   name: lxd_cli
-  # optional: searches ~/.ssh/ by default for public key
-#  public_key_path: "~/.ssh/id_rsa.pub"
 
 provisioner:
   name: chef_zero
-#  name: nodes
+
+platforms:
+- name: ubuntu-14.04
+
+suites:
+- name: default
+  run_list:
+  attributes:
+```
+
+All Options Shown .kitchen.yml
+```yaml
+---
+driver:
+  name: lxd_cli
+  public_key_path: "/my/path/id_rsa.pub"
+  image_name: my-ubuntu-image
+  image_os: ubuntu
+  image_release: trusty
+  profile: my_lxc_profile
+  config: limits.memory=2G
+  domain_name: localdomain
+  dns_servers: ["8.8.8.8","8.8.4.4"]
+  ipv4: 10.0.3.99/24
+  ip_gateway: 10.0.3.1
+  stop_instead_of_destroy: true
+
+provisioner:
+  name: chef_zero
 
 platforms:
 # Following 3 will all use the same image (LTS), but it will be named accordingly
@@ -32,28 +61,20 @@ platforms:
 - name: ubuntu-15.10
 - name: ubuntu-1510
 - name: ubuntu-wily
-```
 
-As of now if you install lxd, and have a public key setup in ~/.ssh/ then you should be able to use plugin without manual intervention.  I have only tested with ubuntu container.  What does it do:
+suites:
+- name: web
+  driver_config:
+    ipv4: 10.0.3.31/24
+  run_list:
+- name: db
+  driver_config:
+    ipv4: 10.0.3.32/24
+  run_list:
 
-Kitchen Create
-
-1) Creates image if its missing.  If a platform is specified LXD will check if an image with the same name exists, if not it will parse the platform name, and install the appropriate image.  If the image exists it will use that image.
-
-2) If container does not exists, creates container.  Using the instance name as the container name, and using the image from previous step.
-
-3) If container exists, starts it
-
-4) copies public key from ~/.ssh/ to container /root/.ssh/
-
-
-Note: if you have troubles with the public key, you can always manually setup public key on container, and publish it to an image.  If the image already exists it will not be download via test-kitchen.
-
-Kitchen Destroy
-
-1) Stops container if its running
+```
 
-2) Destroys container if it exists
+As of now if you install lxd, and have a public key setup in ~/.ssh/ then you should be able to use plugin without manual intervention.  I have only tested with Ubuntu containers.  Good chance most things will work in other Platforms, but some networking config is Ubuntu/Debian specific (dns_servers, domain_name).
 
 LXD Links:
 
@@ -63,17 +84,91 @@ LXD Links:
 
 ## <a name="installation"></a> Installation and Setup
 
+Must have LXD installed on OS, I've only tested on Ubuntu 15.10
+
+Install on command line:
+```
+gem install kitchen-lxd_cli
+```
+or use bundler:
+```
+gem "kitchen-lxd_cli"
+
+gem "kitchen-lxd_cli", :github => "bradenwright/kitchen-lxd_cli"
+
+gem "kitchen-lxd_cli", :path => "~/kitchen-lxd_cli"
+```
 Please read the [Driver usage][driver_usage] page for more details.
 
 ## <a name="config"></a> Configuration
 
-public_key_path config can be manual set or is derived by default based 
+Current config options:
+
+*  image_name
+*  image_os
+*  image_release
+*  profile
+*  config
+*  domain_name
+*  dns_servers
+*  ipv4
+*  ip_gateway
+*  stop_instead_of_destroy
+
+public_key_path: /my/path/public_key_file
+
+can be manual set otherwise is derived by default based 
 ~/.ssh/ directory, specifically the setting is derived by searching for:
 - `~/.ssh/id_rsa.pub`
 - `~/.ssh/id_dsa.pub`
 - `~/.ssh/identity.pub`
 - `~/.ssh/id_ecdsa.pub`
 
+The public key at this location is copied to /root/.ssh in the lxc container to allow password less login.
+
+image_name:
+
+Defaults to platform.name.  Also note that if the image exists it will be used and will not be created.  This allows a container to be published (image manually created).
+
+image_os:
+
+By default platform.name is split on "-" and the first element is used.  E.G. platform.name = ubuntu-14.04 then image_os = ubuntu
+
+image_release:
+
+By default platform.name is split on "-" and the second element is used.  E.G. platform.name = ubuntu-14.04 the image_release = 14.04  For ubuntu 14.04 is changed to release name, E.G. trusty, when image is being downloaded.  For Ubuntu trusty, 14.04, 1404 will all result in the same image being used, it will just be named different depending.  It may work for OS's other than ubuntu but have not tested
+
+profile:
+
+Default is Nil.  See LXC documentation but a lxc profile can be specified.  Which will be passed to "lxc init" command
+
+config:
+
+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) Again option is passed to "lxc launch" command.
+
+domain_name:
+
+Default is nil.
+
+dns_server:
+
+Default is nil.  Which is used for dhcp, if a static ip is setup then dns servers need to be configured for chef to work.  If a static ip is supplied and no dns_server is specified it will try to use the default gateway, google dns (e.g. 10.0.3.1, 8.8.8.8, 8.8.4.4).  If a default gateway is not specified or can't be located then only google dns (8.8.8.8, 8.8.4.4) will be used.  A hash of dns_servers may be specified instead.
+
+LXC NETWORKING OPTIONS: LXC by default uses 10.0.3.2/24 with a gateway of 10.0.3.1.  You may use any ip space you wish, but LXD/LXC install sets up an ethernet bridge on 10.0.3.0/24 so make sure whatever network you choose to use is configured and accessible.  In Ubuntu 15.10, LXD/LXC 0.20 configuration for networking is located at /etc/default/lxc-net, another option other than static ips is to setup dhcp host/ip mappings to reserve ips (described in /etc/default/lxc-net file comments) but it didn't seem to be working for me.  You can also configure DHCP scope, etc.  I've been using static ips from 10.0.3.0/24 and those ips have worked without needing to make changes to LXD/LXC configuration, although I did change the DHCP scope to allow space for static ip addresses (just to make sure there wasn't accidentally overlap)
+
+ipv4:
+
+Allows for Static IP/CIDR to be set, currently netmask is not supported.  E.g. 10.0.3.100/24
+
+ip_gateway:
+
+Allows for a default gateway to be set.  If ipv4 is used ip_gateway default value is 10.0.3.1, if dhcp is used then default gateway is given via dhcp.  Default gateway is also used as a dns_server if static ips are used and no dns server is specified.
+
+
+stop_instead_of_destroy:
+
+Default is false.  Can be useful sometimes to keep machines intact.  It allows kitchen destroy to stop container, kitchen create can be issued to start boxes if they are not running.
+
 ### <a name="config-require-chef-omnibus"></a> require\_chef\_omnibus
 
 Determines whether or not a Chef [Omnibus package][chef_omnibus_dl] will be
@@ -93,11 +188,12 @@ The default value is unset, or `nil`.
 ## <a name="roadmap"></a> Roadmap 
 * Update/Clean README 
 * Config option for remote host, remote user, etc.  So lxc can be launched on a remote server, not just locally
-* Config option for adding/using lxc remote command
+* Config option to add remote for lxc, so images can be downloaded from other locations.  Currently would have to manually be done in LXD/LXC
 * Config option to publish container on verify
-* Config options for static ip, cpu, mem
 * Config option to install upstart (not used by default in containers)
 * Config option for proxy/cache
+* Ability to set more than 1 config (key/value)
+* Example chef cookbook which uses this driver to setup a multi-node web application
 
 ## <a name="development"></a> Development
 
@@ -123,9 +219,9 @@ Created and maintained by [Braden Wright][author] (<braden.m.wright@gmail.com>)
 Apache 2.0 (see [LICENSE][license])
 
 
-[author]:           https://github.com/enter-github-user
-[issues]:           https://github.com/enter-github-user/kitchen-lxd_cli/issues
-[license]:          https://github.com/enter-github-user/kitchen-lxd_cli/blob/master/LICENSE
-[repo]:             https://github.com/enter-github-user/kitchen-lxd_cli
+[author]:           https://github.com/bradenwright
+[issues]:           https://github.com/bradenwright/kitchen-lxd_cli/issues
+[license]:          https://github.com/bradenwright/kitchen-lxd_cli/blob/master/LICENSE
+[repo]:             https://github.com/bradenwright/kitchen-lxd_cli
 [driver_usage]:     http://docs.kitchen-ci.org/drivers/usage
 [chef_omnibus_dl]:  http://www.getchef.com/chef/install/

data/kitchen-lxd_cli.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = Kitchen::Driver::LXD_CLI_VERSION
   spec.authors       = ['Braden Wright']
   spec.email         = ['braden.m.wright@gmail.com']
-  spec.description   = %q{A Test Kitchen Driver for LxdCli}
+  spec.description   = %q{A Test Kitchen Driver for LXD}
   spec.summary       = spec.description
-  spec.homepage      = ''
+  spec.homepage      = 'https://github.com/bradenwright/kitchen-lxd_cli'
   spec.license       = 'Apache 2.0'
 
   spec.files         = `git ls-files`.split($/)

data/lib/kitchen/driver/lxd_cli.rb

@@ -25,7 +25,9 @@ module Kitchen
     # LxdCli driver for Kitchen.
     #
     # @author Braden Wright <braden.m.wright@gmail.com>
-    class LxdCli < Kitchen::Driver::SSHBase
+    class LxdCli < Kitchen::Driver::Base
+      kitchen_driver_api_version 2
+
       default_config :public_key_path do
         [
           File.expand_path('~/.ssh/id_rsa.pub'),
@@ -34,45 +36,46 @@ module Kitchen
           File.expand_path('~/.ssh/id_ecdsa.pub')
         ].find { |path| File.exist?(path) }
       end
+      default_config :stop_instead_of_destroy, false
+      
+      required_config :public_key_path
 
       def create(state)
-        if exists?
-          if running?
-            debug("#{instance.name} already exists, and is already running.  Nothing to do")
-          else
-            debug("#{instance.name} already exists, starting instead")
-            run_command("lxc start #{instance.name}")
-          end
-        else
-          create_image_if_missing
-          run_command("lxc launch #{instance.platform.name} #{instance.name}")
+        unless exists?
+          image_name = create_image_if_missing
+          profile = "-p #{config[:profile]}" if config[:profile]
+          lxc_config = "-c #{config[:config]}" if config[:config]
+          info("Initializing container #{instance.name}")
+          run_lxc_command("init #{image_name} #{instance.name} #{profile} #{lxc_config}")
         end
-        ip_address(state)
+
+        config_and_start_container unless running?
+        configure_dns
+        lxc_ip = wait_for_ip_address
+        state[:hostname] = lxc_ip
         setup_ssh_access
       end
 
       def destroy(state)
         if exists?
           if running?
-            run_command("lxc stop #{instance.name}")
-          else
-            debug("#{instance.name} isn't running, just destroying instead")
+            info("Stopping container #{instance.name}")
+            run_lxc_command("stop #{instance.name}")
           end
-          run_command("lxc delete #{instance.name}")
-        else
-          debug("#{instance.name} doesn't exist.  Nothing to do")
+          info("Deleting container #{instance.name}")
+          run_lxc_command("delete #{instance.name}") unless config[:stop_instead_of_destroy]
         end
         state.delete(:hostname)
       end
 
       private
         def exists?
-          status = `lxc info #{instance.name} > /dev/null 2>&1 && echo $?`.chomp
-          if "#{status}" == "0"
-            debug("#{instance.name} exists")
+          `lxc info #{instance.name} > /dev/null 2>&1`
+          if $?.to_i == 0
+            debug("Container #{instance.name} exists")
             return true
           else
-            debug("#{instance.name} doesn't exist")
+            debug("Container #{instance.name} doesn't exist")
             return false
           end
         end
@@ -80,29 +83,30 @@ module Kitchen
         def running?
           status = `lxc info #{instance.name}`.match(/Status: ([a-zA-Z]+)[\n]/).captures[0].upcase
           if status == "RUNNING"
-            debug("#{instance.name} is running")
+            debug("Container #{instance.name} is running")
             return true
           else
-            debug("#{instance.name} isn't running")
+            debug("Container #{instance.name} isn't running")
             return false
           end
         end
 
         def create_image_if_missing
-          status = `lxc image show #{instance.name} > /dev/null 2>&1 && echo $?`.chomp
-          if "#{status}" == "0"
-            debug("Image #{instance.name} exists")
-            return false
+          image_name = config[:image_name] ||= instance.platform.name
+          `lxc image show #{image_name} > /dev/null 2>&1`
+          if $?.to_i == 0
+            debug("Image #{image_name} exists")
           else
-            debug("Image #{instance.name} doesn't exist, creating now.")
-            image = get_ubuntu_image_info
-            debug("lxd-images import #{image[:os]} #{image[:release]} --alias #{instance.platform.name}")
-            run_command("lxd-images import #{image[:os]} #{image[:release]} --alias #{instance.platform.name}")
-            return true
+            info("Image #{image_name} doesn't exist, creating now. May take a few minutes.")
+            image = get_image_info
+            image_os = config[:image_os] ||= image[:os]
+            image_release = config[:image_release] ||= image[:release]
+            run_local_command("lxd-images import #{image_os} #{image_release} --alias #{image_name}")
           end
+          return image_name
         end
 
-        def get_ubuntu_image_info
+        def get_image_info
           platform, release = instance.platform.name.split('-')
           if platform.downcase == "ubuntu"
             case release.downcase
@@ -119,25 +123,163 @@ module Kitchen
             else
               image = { :os => platform, :release => release }
             end
-            return image
+          else
+            image = { :os => platform, :release => release }
+          end
+          return image
+        end
+
+        def config_and_start_container
+          config[:ip_gateway] ||= "auto"
+          arg_disable_dhcp = ""
+          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("exit")
+            end
+            arg_disable_dhcp = "&& lxc exec #{instance.name} -- sed -i 's/dhcp/manual/g' /etc/network/interfaces.d/eth0.cfg"
+          end
+          # TODO: loop over/run all lxc config settings passed in or figure out how to use multiple with lxc init
+          info("Starting container #{instance.name}")
+          run_lxc_command("start #{instance.name} #{arg_disable_dhcp}")
+        end
+
+        def configure_dns
+          IO.popen("lxc exec #{instance.name} bash", "r+") do |p|
+            dns_servers = ""
+            config[:dns_servers].each do |dns_server|
+              dns_servers += "nameserver #{dns_server}\n"
+            end if config[:dns_servers]
+
+            case config[:ip_gateway]
+            when "auto", ""
+              dns_servers = "nameserver 8.8.8.8\nnameserver 8.8.4.4"
+              dns_servers = "nameserver 8.8.8.8\nnameserver 8.8.4.4"
+            else
+              dns_servers = "nameserver #{config[:ip_gateway]}\nnameserver 8.8.8.8\nnameserver 8.8.4.4"
+            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")
+              p.puts("resolvconf -u")
+            end
+
+            debug("Setting up /etc/hosts")
+            if config[:domain_name]
+#              p.puts("echo -e \"  dns-search #{config[:domain_name]}\" >> /etc/network/interfaces.d/eth0.cfg")
+              args_host = "#{instance.name}.#{config[:domain_name]} #{instance.name}"
+            end
+            args_host ||= "#{instance.name}"
+            wait_for_path("/etc/hosts")
+            p.puts("if grep -iq '127.0.1.1' /etc/hosts; then")
+            p.puts("sed -i 's/^127.0.1.1.*$/127.0.1.1\t#{args_host}/' /etc/hosts")
+            p.puts("else echo '#***** Setup by Kitchen-LxdCli driver *****#' >> /etc/hosts")
+            p.puts("echo -e '127.0.1.1\t#{args_host}' >> /etc/hosts; fi")
+            p.puts("exit")
           end
         end
+=begin
+       def configure_ip_via_lxc_restart
+         debug("Configuring new ip address on eth0")
+
+         IO.popen("lxc exec #{instance.name} bash", "r+") do |p|
+           p.puts('echo -e "#############################################" > /etc/network/interfaces.d/eth0.cfg')
+           p.puts('echo -e "# DO NOT EDIT CONTROLLED BY KITCHEN-LXC_CLI #" >> /etc/network/interfaces.d/eth0.cfg')
+           p.puts('echo -e "#############################################" >> /etc/network/interfaces.d/eth0.cfg')
+           p.puts('echo -e "auto eth0" >> /etc/network/interfaces.d/eth0.cfg')
+           if config[:ipv4]
+             config[:ip_gateway] ||= "10.0.3.1"
+             config[:dns_servers] ||= [ "8.8.8.8", "8.8.4.4" ]
+             p.puts('echo -e "  iface eth0 inet static" >> /etc/network/interfaces.d/eth0.cfg')
+             p.puts("echo -e \"  address #{config[:ipv4]}\" >> /etc/network/interfaces.d/eth0.cfg")
+           else
+             p.puts('echo -e "  iface eth0 inet dhcp" >> /etc/network/interfaces.d/eth0.cfg')
+           end
+           p.puts("echo -e \"  gateway #{config[:ip_gateway]}\" >> /etc/network/interfaces.d/eth0.cfg") if config[:ip_gateway]
+           config[:dns_servers].each do |dns_server|
+             p.puts("echo -e \"  dns-nameserver #{dns_server}\" >> /etc/network/interfaces.d/eth0.cfg")
+           end if config[:dns_servers]
+           if config[:domain_name]
+             p.puts("echo -e \"  dns-search #{config[:domain_name]}\" >> /etc/network/interfaces.d/eth0.cfg")
+           end
+           p.puts("exit")
+         end
+         debug("Finished configuring new ip address, restarting #{instance.name} for settings to take effect")
+         debug_note_about_configuring_ip
+         wait_for_ip_address
+         sleep 3 # Was hanging more often than not whenever I lowered the sleep
+         debug("Restarting #{instance.name}")
+         run_lxc_command("restart #{instance.name}")
+         debug("Finished restarting #{instance.name} ip address should be configured")
+       end
+=end
+
+        def setup_ssh_access
+          info("Setting up public key #{config[:public_key_path]} on #{instance.name}")
+          wait_for_path("/root/.ssh")
+
+          begin
+            debug("Uploading public key...")
+            `lxc file push #{config[:public_key_path]} #{instance.name}/root/.ssh/authorized_keys 2> /dev/null`
+            break if $?.to_i == 0
+            sleep 0.3
+          end while true
+
+          debug("Finished Copying public key from #{config[:public_key_path]} to #{instance.name}")
+        end
 
-        def ip_address(state)
+        def wait_for_ip_address
+          info("Waiting for network to become ready")
           begin
-            lxc_info = `lxc info #{instance.name}`
-          end while (!lxc_info.match(/eth0:[\t]IPV[46][\t]([0-9.]+)[\n]/))
-          lxc_ip = lxc_info.match(/eth0:[\t]IPV[46][\t]([0-9.]+)[\n]/).captures[0].to_s
-          state[:hostname] = lxc_ip
+            lxc_info = `lxc info #{instance.name}`.match(/^[ ]+eth0:[\t]IPV4[\t]([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+).*$/)
+            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
+            sleep 0.3
+          end while true
+          debug("Found Ip Address #{lxc_ip}")
           return lxc_ip
         end
 
+        def wait_for_path(path)
+          begin
+            debug("Waiting for #{path} to become available...")
+            run_lxc_command("exec #{instance.name} -- ls #{path}")
+            break if $?.to_i == 0
+            sleep 0.3
+          end while true
+          debug("Found #{path}")
+        end
+
         def setup_ssh_access
-          info("Copying public key from #{config[:public_key_path]} to #{instance.name}")
+          info("Setting up public key #{config[:public_key_path]} on #{instance.name}")
+          wait_for_path("/root/.ssh")
+ 
           begin
-            sleep 1
-            status = `lxc file push #{config[:public_key_path]} #{instance.name}/root/.ssh/authorized_keys 2> /dev/null && echo $?`.chomp
-          end while ("#{status}" != "0")
+            debug("Uploading public key...")
+            `lxc file push #{config[:public_key_path]} #{instance.name}/root/.ssh/authorized_keys 2> /dev/null`
+            break if $?.to_i == 0
+            sleep 0.3
+          end while true
+
+          debug("Finished Copying public key from #{config[:public_key_path]} to #{instance.name}")
+        end
+
+        def run_lxc_command(cmd)
+          run_local_command("lxc #{cmd}") if cmd
+        end
+
+        def run_local_command(cmd)
+          debug("run_local_command ran: #{cmd}")
+          `#{cmd}` if cmd
+          debug("Command finished: #{$?.to_s}")
+        end
+
+        def debug_note_about_configuring_ip
+          debug("NOTE: Restarting seemed to be the only way I could get things to work.  Tried lxc profiles, config options.  Tried restart networking service but it didn't work, also tried passing command like ifconfig 10.0.3.x/24 eth0 up.  Which set the ip but after container ran for a while, it would reset to dhcp address that had been assigned.  Restarting container seems to be working, and is really fast.  Open to better alternatives.")
         end
     end
   end

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.0.beta"
+    LXD_CLI_VERSION = "0.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-lxd_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta
+  version: 0.1.0
 platform: ruby
 authors:
 - Braden Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -94,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A Test Kitchen Driver for LxdCli
+description: A Test Kitchen Driver for LXD
 email:
 - braden.m.wright@gmail.com
 executables: []
@@ -103,8 +103,10 @@ extra_rdoc_files: []
 files:
 - ".cane"
 - ".gitignore"
+- ".kitchen/logs/kitchen.log"
 - ".tailor"
 - ".travis.yml"
+- ":w"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -113,7 +115,7 @@ files:
 - kitchen-lxd_cli.gemspec
 - lib/kitchen/driver/lxd_cli.rb
 - lib/kitchen/driver/lxd_cli_version.rb
-homepage: ''
+homepage: https://github.com/bradenwright/kitchen-lxd_cli
 licenses:
 - Apache 2.0
 metadata: {}
@@ -128,14 +130,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: A Test Kitchen Driver for LxdCli
+summary: A Test Kitchen Driver for LXD
 test_files: []
 has_rdoc: