kitchen-lxd_cli 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a122089b7742dd6200e4989317330712e0d1900a
-  data.tar.gz: ce6ef71bb797a9cd96874382b647644b4809a0f9
+  metadata.gz: 3aba5aaed0f962cf7e3f0d09e27bd1260204e6e6
+  data.tar.gz: 7e31964bf92ed3b05c05262c4fa5588df05ebe63
 SHA512:
-  metadata.gz: 94f664ec976a9c59913e1c9f8b29cb1bf025a0ef959562000f2ef67e91d7b1231f3ec6f2b635f333bed2f32b66da732dc6aa26cd55a828c870703411ed428799
-  data.tar.gz: 02987d6fb2ad4ee40cb4ad6b5081bcad24a759a39f08580c2d9a914e0968e4242c4f459daee514c2c12bcf1fd576c8df3230713ae372f50e4138e4859a000952
+  metadata.gz: 88dad7ad58fb0e1acba6b90c4848b042bb32fbef856876c2bead66b0d2c749f932a14a75debb37c34b7e5f4c8e40524381934d59dfb7276d524d58343cb1897a
+  data.tar.gz: 182c4bfdf26a9c7411cb8d2dd534efb39917f066f93f91e998245dff213a7d0e62a45e663d909df133017e8765de38c30fd514dc71b49ad2dbb7893551003791

data/lib/kitchen/driver/lxd_cli.rb

@@ -37,7 +37,7 @@ module Kitchen
           File.expand_path('~/.ssh/identity.pub'),
           File.expand_path('~/.ssh/id_ecdsa.pub')
         ].find { |path| File.exist?(path) }
-          
+
         raise 'Public key could not be found in the public_key_path provided.  Please update the kitchen-lxd_cli config public_key_path in kitchen yaml or create a ssh key pair (e.g. `ssh-keygen -t rsa`)' unless pub_key
 
         pub_key
@@ -70,7 +70,7 @@ module Kitchen
         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 [ ! -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
@@ -134,9 +134,9 @@ module Kitchen
           unless image_exists?(image_name)
             info("Creating image #{image_name} now.")
             image = get_image_info
-            image_os = config[:image_os] 
+            image_os = config[:image_os]
             image_os ||= image[:os]
-            image_release = config[:image_release] 
+            image_release = config[:image_release]
             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 }
@@ -185,7 +185,7 @@ module Kitchen
         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 = config[:image_name]
             image_name ||= instance.platform.name
           end
 
@@ -211,8 +211,9 @@ module Kitchen
             return false
           end
         end
-
+0
         def config_and_start_container
+          platform, release = instance.platform.name.split('-')
           config[:ip_gateway] ||= "auto"
           arg_disable_dhcp = ""
 
@@ -221,7 +222,11 @@ module Kitchen
               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"
+            if platform.downcase == "ubuntu"
+              arg_disable_dhcp = "&& lxc exec #{@@instance_name} -- sed -i 's/dhcp/manual/g' /etc/network/interfaces.d/eth0.cfg"
+            elsif platform.downcase == "centos"
+              arg_disable_dhcp = "&& lxc exec #{@@instance_name} -- sed -i 's/dhcp/none/g'  /etc/sysconfig/network-scripts/ifcfg-eth0"
+            end
           end
 
           info("Starting container #{@@instance_name}")
@@ -443,7 +448,7 @@ module Kitchen
           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")

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 = "2.0.1"
+    LXD_CLI_VERSION = "2.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-lxd_cli
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Braden Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-10 00:00:00.000000000 Z
+date: 2016-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -133,9 +133,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver for LXD
 test_files: []
-has_rdoc: