kitchen-lxd_cli 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a65b448e80451e4143b9f1ef2eaf7bb0f5dab4f
-  data.tar.gz: 7fffe1a9ddd489f45fcbe28b8dbf4a6afa49e9e9
+  metadata.gz: cd56e6cb62ec4b0bf4f099521e195d42bacb3a90
+  data.tar.gz: ee398952d35afd1145877c0e587a82b01f63195c
 SHA512:
-  metadata.gz: e8817e841aa26dafd5e7c4bf4381875c10f9983a348d5a703a141cd62a98dcc41a9705f96fa37320065c0e9bf5def81f0bc7fff07fcb4337dcc993bf09f65e2c
-  data.tar.gz: 76f04d46e7e53b667e9d846e1c27f5d86af5df6e83ef023f4a99adb6b2228a92f29caaf826607f6e63185a35051e329f127df0219bd7ef073d3d462b567032b7
+  metadata.gz: f842f5c0031c0dbaa23dc839f57905981bfbae95f436da9c55f5903b452e19cb342f455273adfd737c84e1980b081fe331b4150d90727bc4f7544933bc9893b4
+  data.tar.gz: 1f6180cb8e220ee0e86ea6da7b884ce083f1cd3d297b9eb6d816f2fa0936691924ae76f8917c780721a1134be0586de7ed8590d2781a3a7eb4d9a7bfb02076fe

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 *.swp
+.kitchen/*

data/README.md

@@ -1,18 +1,16 @@
 # <a name="title"></a> Kitchen::LxdCli
 
-A Test Kitchen Driver for LxdCli.
-
-At this point would NOT recommend using in Production.
+A Test Kitchen Driver for LXD / LXC
 
 ## <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.
+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.
 
-Basics are working.  I'm running lxd --version 0.20 on ubuntu 15.10.
+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 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.  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.  At least if someone like me wants to play with lxd, chef, test-kitchen they can test some basics without having to recreate the wheel.
+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.
 
-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.
+I AM VERY OPEN TO SUGGESTIONS / HELP.  As I mentioned this is my first kitchen driver / published ruby gem.
 
 Minimal .kitchen.yml
 ```yaml
@@ -32,6 +30,17 @@ suites:
   attributes:
 ```
 
+Recommended for Faster Development
+```yaml
+---
+driver:
+  name: lxd_cli
+  image_name: my-ubuntu-image #Publish your own image, with base install.  Including Chef.
+  verifier_path: "/opt/verifier"
+  lxd_proxy_install: true
+
+```
+
 All Options Shown .kitchen.yml
 ```yaml
 ---
@@ -56,12 +65,24 @@ driver:
 #  lxd_proxy_update: true
 #  lxd_proxy_path: "~/.lxd_proxy"
 #  lxd_proxy_github_url: "-b development --single-branch https://github.com/bradenwright/cookbook-lxd_polipo
-
+#  enable_wait_for_ssh_login: true
+  mount:
+    rails_mongodb_app:
+      local_path: "/mylocalpath"
+      container_path: "/mnt/rails_mongodb_app"
   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
+  verifier_path: "/opt/verifier"
   stop_instead_of_destroy: true
+  publish_image_name: "kitchen-base-ubuntu-1404"
+  use_publish_image: true
+  publish_image_before_destroy: true
+  publish_image_overwrite: true
+  enable_wait_for_ssh_login: false
+
+
 
 provisioner:
   name: chef_zero
@@ -128,6 +149,11 @@ Current config options:
 *  ipv4
 *  ip_gateway
 *  never_destroy
+*  verifier_path
+*  publish_image_before_destroy
+*  publish_image_name
+*  publish_image_overwrite
+*  use_publish_image
 *  lxd_proxy_install
 *  lxd_proxy_destroy
 *  lxd_proxy_verify
@@ -135,7 +161,7 @@ Current config options:
 *  lxd_proxy_path
 *  lxd_proxy_github_url
 
-public_key_path:
+### public_key_path
 
 can be manual set otherwise is derived by default based 
 ~/.ssh/ directory, specifically the setting is derived by searching for:
@@ -146,54 +172,148 @@ can be manual set otherwise is derived by default based
 
 The public key at this location is copied to /root/.ssh in the lxc container to allow password less login.
 
-image_name:
+`public_key_path: "/path/to/my/public/key"`
+
+### 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:
+`image_name: "my-container-image"`
+
+### 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:
+`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:
+`image_release: "trusty"`
+
+### profile
+
+Default is Nil.  See LXC documentation but a lxc profile can be specified.  Which will be passed to "lxc init" command.  A String or an Array are accepted.
 
-Default is Nil.  See LXC documentation but a lxc profile can be specified.  Which will be passed to "lxc init" command
+`profile: "migratable"`
 
+`profile: [ "default", "migratable" ]`
+
+
+### 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).  Config options are passed to "lxc init" command.  A String or a Hash of key/value pairs is accepted.
+
+`config: "limits.memory=2G"`
+
+```yaml
 config:
+  limits.memory: 1G
+  limits.cpus: 2
+  boot.autostart: true
+```
 
-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).  Hash of config options is looped over and "lxc config set" command is run for each key/value pair.
+### mount
+  Default is Nil.  Mount allows for local directories to be mounted inside the container.  Must have the following format:
 
-domain_name:
+```yaml
+mount:
+  myhome:
+    local_path: "<%= ENV['HOME'] %>"
+    container_path: "/mnt/myhome"
+  mymount2:
+    local_path: "/my/local/path"
+    container_path: "/my/container/path"
+```
 
-Default is nil.
+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>` 
 
-dns_server:
+### domain_name
+
+Default is nil.  String can be provided
+
+`domain_name: "mydomain.com"`
+
+### 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)
+`dns_servers: ["10.0.3.1", "8.8.8.8", "8.8.4.4"]`
+
+##### LXC NETWORKING OPTIONS 
 
-ipv4:
+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)
+
+**NOTE:  Networking options will not work LXD 0.21, 0.22 [Github Issue](https://github.com/lxc/lxd/issues/1259)**
+
+### ipv4
 
 Allows for Static IP/CIDR to be set, currently netmask is not supported.  E.g. 10.0.3.100/24
 
-ip_gateway:
+`ipv4: "10.0.3.99/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.
 
+`ip_gateway: "10.0.3.1"`
 
-never_destroy:
+### never_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.
 
-lxd_proxy_install:
+`never_destroy: true`
+
+### verifier_path
 
-Default is false.  If true it installs polipo proxy by cloning  into .lxd_proxy and running test kitchen in that directory.  It only runs the first time unless you tell it to update.  Also if the proxy already exists from another project, the existing container (named proxy-ubuntu-1404) will be used, started if necessary.  Recommended use for testing would be to set this value to true and leave all others as defaults.  It will significantly increase your test kitchen runs.  But be sure to setup nodes in .kitchen.yml with normal proxy settings, e.g.
+Default is nil.  If nil, then normal setting are used, i.e. /tmp/verifier is the path.  Since its in /tmp, it gets deleted on restart.  I tried other options that I've found (BUT DIDN'T WORK), like:
 
 ```
+# DID NOT WORK!!!
+busser:
+  root_path: /opt/verifier
+```
+
+Since that option isn't working set verifier_path will create a directory if its missing and create a symbolic link from /tmp/verifier to the directroy specified.  This is particular usefuly when publishing an image.  E.g.
+
+`verifier_path: "/opt/verifier"`
+
+This will save verifier gems to a permanent location, I publish a base install with verifier gems install in /opt/verifier.  By publishing and using this image, everytime the container is created it doesn't have to go through the process of installing multiple gems (which can be a little slow, especially if you have to recreate boxes often).
+
+### publish_image_before_destroy
+
+Default is false.  If true, then after the container is stopped but before it is destroyed the container will be published as a local image.
+
+`publish_image_before_destroy: true`
+
+### publish_image_name
+
+Default is "kitchen-#{instance.name}", sets the name/alias for the lxc image
+
+`publish_image_name: "my-published-image"`
+
+### publish_image_overwrite
+
+Default is false.  If true if an image of the same name exists, it will be deleted so the new image of the same name can be published.
+
+`publish_image_overwrite: true`
+
+### use_publish_image
+
+Default is false.  If true then if the published_image_name exists as an lxc image it will be used to instead of using image name, or the image_name which is generated based on the instance.name
+
+`use_publish_image: true`
+
+### lxd_proxy_install
+
+Default is false.  If true it installs polipo proxy by cloning  into .lxd_proxy and running test kitchen in that directory.  It only runs the first time unless you tell it to update.  Also if the proxy already exists from another project, the existing container (named proxy-ubuntu-1404) will be used, started if necessary.  Recommended use for testing would be to set this value to true and leave all others as defaults.  It will significantly increase your test kitchen runs.  
+
+`lxd_proxy_install: true`
+
+But be sure to setup nodes in .kitchen.yml with normal proxy settings, so the proxy is used
+
+```yaml
 provisioner:
   name: chef_zero
   http_proxy: http://10.0.3.5:8123
@@ -201,26 +321,48 @@ provisioner:
   chef_omnibus_url: http://www.chef.io/chef/install.sh
 ```
 
-lxd_proxy_destroy:
+chef_omnibus_url of http is provided b/c it allows proxy to be utilized for chef install, with https (aka default) chef install is not utlizing proxy.
+
+### lxd_proxy_destroy
 
 Default is false.  By default proxy is not destroyed and it is set to auto boot.  This way after proxy is installed once, it should just be there and usable for all your cookbooks.
 
-lxd_proxy_verify:
+`lxd_proxy_destroy: true`
+
+### lxd_proxy_verify
 
 Default is false.  If false then kitchen converge command is used, which speeds up the process.  If you want to run serverspec tests to ensure polipo is up set this value to true.
 
-lxd_proxy_update:
+`lxd_proxy_verify: true`
+
+### lxd_proxy_update
 
 Default is false.  Very little has been tested, and could be errors that one would manually have to deal with.  But it attempts to pull from git, update berkshelf, re-run kitchen converge.  Takes extra time but may come in useful.  At this point I would recommend just destroying and recreating the lxd_proxy if there are any issues.
 
-lxd_proxy_path:
+`lxd_proxy_update: true`
+
+### lxd_proxy_path
 
 Default is `~/.lxd_proxy` Path of where github gets cloned can be changed.  That location is used so only 1 copy needs to exist on disk for all cookbook.  But most of the disk space is the lxc container thats running the polipo proxy, container is named proxy-ubuntu-1404 by default.
 
-lxd_proxy_github_url:
+`lxd_proxy_path: "/my/proxy/path"`
+
+### lxd_proxy_github_url
 
 Default is https://github.com/bradenwright/cookbook-lxd_polipo basically if can be overridden so that whatever repo is used.  Idea being that someone can customize the polipo install I have setup.  Or try to use a completely different type of proxy (not polipo) as long as the git-repo would create a proxy by running `bundle install` and `bundle exec kitchen converge`.  Also if you don't want to use github if you setup a container named proxy-ubuntu-1404, ie `lxc info proxy-ubuntu-1404` returns a box it will be used.
 
+```yaml
+lxd_proxy_github_url: "-b development --single-branch https://github.com/bradenwright/cookbook-lxd_polipo"
+```
+
+### enable_wait_for_ssh_login
+
+Default is false.  If set to true container will loop until it can login to ssh, this ensures that ssh is ready before kitchen moves on to converging.  It's false by default b/c it slows things down, and I only seemed to need it after using publishing option.  Specifically if I didn't remove /root/.ssh, if I did remove /root/.ssh before publishing, then the sleep/time to setup ssh_public_key seemed to wait long enough that kitchen converge was not timing out.
+
+`enable_wait_for_ssh_login: true`
+
+NOTE: Hope is that I can resolve the issues of needing to wait by writing a transport that uses lxc commands and not ssh, also will improve sped since ssh login is slow.
+
 ### <a name="config-require-chef-omnibus"></a> require\_chef\_omnibus
 
 Determines whether or not a Chef [Omnibus package][chef_omnibus_dl] will be
@@ -241,13 +383,16 @@ The default value is unset, or `nil`.
 * 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 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 option to install upstart (not used by default in containers)
 * Example chef cookbook which uses this driver to setup a multi-node web application
 * Allow specifying name of container
-* More thorough check to see if proxy exists, right now looking for directory
-* Ability to configure ip, maybe ram, etc too, for lxd_proxy_install (currently would need to be done manually, either via lxc or via .lxd_proxy/.kitchen.yml)
+* Fix issue with installing proxy on first run and running multiple nodes with `kitchen converge -p`. Need a more thorough check to see if proxy exists, right now looking for directory.  LXC shows box as running, also may want to run a check to make sure lxc shows same ip that is setup in .kitchen.yml file.
+* Ability to configure options for lxd_proxy_install, such as: ip, maybe ram, etc (currently would need to be done manually, either via lxc or via .lxd_proxy/.kitchen.yml)
+* Option for dhcp proxy, find ip proxy is running on in Kitchen driver and use it, by default instead of using 10.0.3.5.
 * Write a transport for lxd_cli, using ssh is a lot slower than using lxc commands
+* Write ServerSpec tests.  [kitchen-openstack]() and [kitchen-ec2]() have good examples.
+* Update all licensing to Apache 2.0, or something else that free, some stuff may have defaulted differently.  Also check [cookbook-lxd_polipo](https://github.com/bradenwright/cookbook-lxd_polipo)
+* Ability to use snapshots, along with test-kitchen to speed up testing.  Idea being if config option is set, then on destroy a snapshot will be taken.  When kitchen create is run snapshot would be reverted.  options: snapshot_name, snapshot_before_destroy, snapshot_revert_on_create
+* Copy / Migrate on Destroy
 
 ## <a name="development"></a> Development
 

data/lib/kitchen/driver/lxd_cli.rb

@@ -47,9 +47,10 @@ module Kitchen
 
         unless exists?
           image_name = create_image_if_missing
-          profile = "-p #{config[:profile]}" if config[:profile]
+          profile_args = setup_profile_args if config[:profile]
+          config_args = setup_config_args if config[:config]
           info("Initializing container #{instance.name}")
-          run_lxc_command("init #{image_name} #{instance.name} #{profile}")
+          run_lxc_command("init #{image_name} #{instance.name} #{profile_args} #{config_args}")
         end
 
         config_and_start_container unless running?
@@ -57,6 +58,11 @@ module Kitchen
         lxc_ip = wait_for_ip_address
         state[:hostname] = lxc_ip
         setup_ssh_access
+        wait_for_ssh_login(lxc_ip) if config[:enable_wait_for_ssh_login] == "true"
+        IO.popen("lxc exec #{instance.name} bash", "r+") do |p|
+          p.puts("if [ ! -d '#{config[:verifier_path]}' ]; then mkdir -p #{config[:verifier_path]}; fi") 
+          p.puts("if [ ! -L '/tmp/verifier' ]; then ln -s #{config[:verifier_path]} /tmp/verifier; fi")
+        end if config[:verifier_path] && config[:verifier_path].length > 0
       end
 
       def destroy(state)
@@ -65,6 +71,9 @@ 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]
             info("Deleting container #{instance.name}")
             run_lxc_command("delete #{instance.name}") unless config[:never_destroy] && config[:never_destroy] == true
@@ -98,18 +107,19 @@ module Kitchen
         end
 
         def create_image_if_missing
-          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
-            info("Image #{image_name} doesn't exist, creating now.")
+          image_name = get_image_name
+
+          unless image_exists?(image_name)
+            info("Creating image #{image_name} now.")
             image = get_image_info
-            image_os = config[:image_os] ||= image[:os]
-            image_release = config[:image_release] ||= image[:release]
+            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 }
           end
+
           return image_name
         end
 
@@ -136,9 +146,54 @@ module Kitchen
           return image
         end
 
+        def publish_image
+          publish_image_name = get_publish_image_name
+          if image_exists?(publish_image_name)
+            if config[:publish_image_overwrite] == true
+              info("Deleting existing image #{publish_image_name}, so image of same name can be published")
+              run_lxc_command("image delete #{publish_image_name}")
+            else
+              raise "Image #{publish_image_name} already exists!  If you wish to overwrite it set publish_image_overwrite: true in kitchen.yml"
+            end
+          end
+          info("Publishing image #{publish_image_name}")
+          run_lxc_command("publish #{instance.name} --alias #{publish_image_name}")
+        end
+
+        def get_image_name
+          image_name = get_publish_image_name
+          unless config[:use_publish_image] == true && image_exists?(image_name)
+            image_name = config[:image_name] 
+            image_name ||= instance.platform.name
+          end
+
+          debug("Image Name is #{image_name}")
+          return image_name
+        end
+
+        def get_publish_image_name
+          publish_image_name = config[:publish_image_name]
+          publish_image_name ||= "kitchen-#{instance.name}"
+
+          debug("Publish Image Name is #{publish_image_name}")
+          return publish_image_name
+        end
+
+        def image_exists?(image_name)
+          `lxc image show #{image_name} > /dev/null 2>&1`
+          if $?.to_i == 0
+            debug("Image #{image_name} exists")
+            return true
+          else
+            debug("Image #{image_name} does not exist")
+            return false
+          end
+        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 -")
@@ -146,14 +201,48 @@ module Kitchen
             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
-          IO.popen("bash", "r+") do |p|
-            config[:config].each do |key, value|
-              p.puts("lxc config set #{instance.name} #{key} #{value}")
-            end if config[:config]
-          end
+
           info("Starting container #{instance.name}")
           run_lxc_command("start #{instance.name} #{arg_disable_dhcp}")
+          setup_mount_bindings if config[:mount].class == Hash
+        end
+
+        def setup_config_args
+          config_args = ""
+          if config[:config].class == String
+            config_args += " -c #{config[:config]}"
+          else
+            config[:config].each do |key, value|
+              config_args += " -c #{key}=#{value}"
+            end
+          end
+          if config[:mount].class == Hash
+            debug("security.privileged=true is added to Config Args, b/c its needed for mount binding")
+            config_args += " -c security.privileged=true"
+          end
+          debug("Config Args: #{config_args}")
+          return config_args
+        end
+
+        def setup_profile_args
+          profile_args = ""
+          if config[:profile].class == String
+            profile_args += " -p #{config[:profile]}"
+          else
+            config[:profile].each do |profile|
+              profile_args += " -p #{profile}"
+            end
+          end
+          debug("Profile Args: #{profile_args}")
+          return profile_args
+        end
+
+        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]}")
+            end
+          end if config[:mount].class == Hash
         end
 
         def configure_dns
@@ -194,41 +283,6 @@ module Kitchen
             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}")
@@ -307,6 +361,16 @@ module Kitchen
           debug("Found #{path}")
         end
 
+        def wait_for_ssh_login(ip)
+          begin
+            debug("Trying to login into #{ip} via SSH...")
+            `ssh root@#{ip} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no 'true' > /dev/null 2>&1`
+            break if $?.to_i == 0
+            sleep 0.3
+          end while true
+          debug("SSH is up, able to login at root@#{ip}")
+        end
+
         def run_lxc_command(cmd)
           run_local_command("lxc #{cmd}") if cmd
         end
@@ -320,6 +384,44 @@ module Kitchen
         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
+
+        
+=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
+
     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.3"
+    LXD_CLI_VERSION = "0.1.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-lxd_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Braden Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-07 00:00:00.000000000 Z
+date: 2015-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -103,7 +103,6 @@ extra_rdoc_files: []
 files:
 - ".cane"
 - ".gitignore"
-- ".kitchen/logs/kitchen.log"
 - ".tailor"
 - ".travis.yml"
 - CHANGELOG.md

data/.kitchen/logs/kitchen.log

@@ -1,26 +0,0 @@
-E, [2015-11-06T17:54:18.362107 #26784] ERROR -- Kitchen: ------Exception-------
-E, [2015-11-06T17:54:18.362275 #26784] ERROR -- Kitchen: Class: Kitchen::UserError
-E, [2015-11-06T17:54:18.362315 #26784] ERROR -- Kitchen: Message: Kitchen YAML file /home/braden/kitchen-lxd_cli/.kitchen.yml does not exist.
-E, [2015-11-06T17:54:18.362337 #26784] ERROR -- Kitchen: ------Backtrace-------
-E, [2015-11-06T17:54:18.362355 #26784] 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-06T17:54:18.362373 #26784] 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-06T17:54:18.362391 #26784] 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-06T17:54:18.362408 #26784] 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-06T17:54:18.362426 #26784] 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-06T17:54:18.362443 #26784] 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-06T17:54:18.362461 #26784] 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-06T17:54:18.362478 #26784] 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-06T17:54:18.362495 #26784] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/test-kitchen-1.4.2/lib/kitchen/command/list.rb:32:in `call'
-E, [2015-11-06T17:54:18.362512 #26784] 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-06T17:54:18.362552 #26784] ERROR -- Kitchen: /opt/chefdk/embedded/lib/ruby/gems/2.1.0/gems/test-kitchen-1.4.2/lib/kitchen/cli.rb:108:in `list'
-E, [2015-11-06T17:54:18.362570 #26784] 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-06T17:54:18.362587 #26784] 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-06T17:54:18.362604 #26784] 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-06T17:54:18.362621 #26784] 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-06T17:54:18.362638 #26784] 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-06T17:54:18.362655 #26784] 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-06T17:54:18.362672 #26784] 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-06T17:54:18.362689 #26784] 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-06T17:54:18.362706 #26784] ERROR -- Kitchen: /opt/chefdk/bin/kitchen:14:in `load'
-E, [2015-11-06T17:54:18.362723 #26784] ERROR -- Kitchen: /opt/chefdk/bin/kitchen:14:in `<main>'
-E, [2015-11-06T17:54:18.362739 #26784] ERROR -- Kitchen: ----------------------