kitchen-lxd_cli 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52485f02dbbda394899978f838d672451bdde23b
-  data.tar.gz: 47b30148b6eea206fee2e933479273d00f1aac3b
+  metadata.gz: 112756d8089174d8d09c213de838bab91c83e3e0
+  data.tar.gz: c5f39fe2e691968c105ba1cddb90a09d8e0dc468
 SHA512:
-  metadata.gz: 3993508b35e822506216eeb85e61414712548c2450417f3f9a1cef4835e08f2f1eaf2fdb06f0b9a86d2bf6d5a11e47c22e7e49d2470476b8b8a16ee360dd8afb
-  data.tar.gz: aa25788d28a0d516d311f11b21569ae28c7726b7cc4bee8372899d5d5161a676b33642ac3793486f2aaa0bfe89b23c70c10f095076c30426b2858765a6dea462
+  metadata.gz: 178e25551ee4becf7e0372994ca22195c331769640218a2b0a923fe11f4bde1b06e90a4f61bb87c15ea981dcae1e89c64b2f9241fbb70c63377d45d51feef3b0
+  data.tar.gz: 7694f9f60cc3e1cdccd56b4d1b6e52f8954593e7ca23100a69f405c1e654c46b5eafdd5a951c0a5828e1211ccf02fe113c6a6fb5511596d92c84177882671d11

data/README.md

@@ -115,7 +115,7 @@ Current config options:
 *  ip_gateway
 *  stop_instead_of_destroy
 
-public_key_path: /my/path/public_key_file
+public_key_path:
 
 can be manual set otherwise is derived by default based 
 ~/.ssh/ directory, specifically the setting is derived by searching for:

data/lib/kitchen/driver/lxd_cli.rb

@@ -101,9 +101,8 @@ module Kitchen
             image = get_image_info
             image_os = config[:image_os] ||= image[:os]
             image_release = config[:image_release] ||= image[:release]
-            info("This may take a little while.  If image fails, or you want to see progress bar, stop this and run the following command manually:")
-            info("lxd-images import #{image_os} #{image_release} --alias #{image_name}")
-            run_local_command("lxd-images import #{image_os} #{image_release} --alias #{image_name}")
+            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
@@ -166,6 +165,7 @@ module Kitchen
               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
 

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.1"
+    LXD_CLI_VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-lxd_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Braden Wright
@@ -106,7 +106,6 @@ files:
 - ".kitchen/logs/kitchen.log"
 - ".tailor"
 - ".travis.yml"
-- ":w"
 - CHANGELOG.md
 - Gemfile
 - LICENSE

data/:w

@@ -1,176 +0,0 @@
-# -*- 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