kitchen-lxd_cli 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad7b7dd864e7373d8f549d39ffc1ddbb58f3d929
-  data.tar.gz: 1ca5ed8845e1ed386320d5f228a7f22cd1bf38da
+  metadata.gz: a122089b7742dd6200e4989317330712e0d1900a
+  data.tar.gz: ce6ef71bb797a9cd96874382b647644b4809a0f9
 SHA512:
-  metadata.gz: 67c2f7b009f1f3941674d9c15e08437cc18e7361309e90dfbc70941dcd54dc97f0f53e0489eb7a8cc13511ea013c04821164f9c6a2924e98364f225eab3547ed
-  data.tar.gz: 482187b180da0b2412be0e233fb4bbc4d8b7644a9c34da4cdee76e1d5d366eb011b666397c7d1ea9057fd31a9c806012f90c21eac535aad718dace56361d7d5e
+  metadata.gz: 94f664ec976a9c59913e1c9f8b29cb1bf025a0ef959562000f2ef67e91d7b1231f3ec6f2b635f333bed2f32b66da732dc6aa26cd55a828c870703411ed428799
+  data.tar.gz: 02987d6fb2ad4ee40cb4ad6b5081bcad24a759a39f08580c2d9a914e0968e4242c4f459daee514c2c12bcf1fd576c8df3230713ae372f50e4138e4859a000952

data/README.md

@@ -65,7 +65,6 @@ 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"
@@ -79,6 +78,7 @@ driver:
   use_publish_image: true
   publish_image_before_destroy: true
   publish_image_overwrite: true
+  lxd_unique_name: true
   enable_wait_for_ssh_login: false
   username: kitchen-user
 
@@ -160,6 +160,7 @@ Current config options:
 *  lxd_proxy_update
 *  lxd_proxy_path
 *  lxd_proxy_github_url
+*  lxd_unique_name
 
 ### public_key_path
 
@@ -357,6 +358,10 @@ Default is https://github.com/bradenwright/cookbook-lxd_polipo basically if can
 lxd_proxy_github_url: "-b development --single-branch https://github.com/bradenwright/cookbook-lxd_polipo"
 ```
 
+### lxd_unique_name
+
+Default is true.  If true a file is written to .kitchen/<instance_name>.lxd with the unique name.  This file is used to identify the lxd instance.  If you don't want this feature, set to false
+
 ### 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.

data/lib/kitchen/driver/lxd_cli.rb

@@ -30,29 +30,36 @@ module Kitchen
       kitchen_driver_api_version 2
 
       default_config :public_key_path do
+        pub_key = \
         [
           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) }
+          
+        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
       end
       default_config :never_destroy, false
       default_config :lxd_proxy_path, "#{ENV['HOME']}/.lxd_proxy"
       default_config :lxd_proxy_update, false
-      default_config :username, "root"
+      default_config :username, 'root'
+      default_config :lxd_unique_name, true
 
-      required_config :public_key_path
+      @@instance_name
 
       def create(state)
+        @@instance_name = get_or_create_unique_instance_name
         install_proxy if config[:lxd_proxy_install] && config[:lxd_proxy_install] == true
 
         unless exists?
           image_name = create_image_if_missing
           profile_args = setup_profile_args if config[:profile]
           config_args = setup_config_args
-          info("Initializing container #{instance.name}")
-          run_lxc_command("init #{image_name} #{instance.name} #{profile_args} #{config_args}")
+          info("Initializing container #{@@instance_name}")
+          run_lxc_command("init #{image_name} #{@@instance_name} #{profile_args} #{config_args}")
         end
 
         config_and_start_container unless running?
@@ -62,24 +69,26 @@ module Kitchen
         state[:username] = config[:username]
         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|
+        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)
+        @@instance_name = get_or_create_unique_instance_name
         if exists?
           if running?
-            info("Stopping container #{instance.name}")
-            run_lxc_command("stop #{instance.name}")
+            info("Stopping container #{@@instance_name}")
+            run_lxc_command("stop #{@@instance_name} --force")
           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
+          unless config[:never_destroy] && config[:never_destroy] == true
+            info("Deleting container #{@@instance_name}")
+            run_lxc_command("delete #{@@instance_name} --force")
+            File.delete(".kitchen/#{instance.name}.lxd_unique_name") if File.exist?(".kitchen/#{instance.name}.lxd_unique_name")
           end
         end
         state.delete(:hostname)
@@ -87,24 +96,34 @@ module Kitchen
       end
 
       private
+        def get_or_create_unique_instance_name
+          if config[:lxd_unique_name] == false
+            instance_name = instance.name
+          else
+            File.write(".kitchen/#{instance.name}.lxd", "#{instance.name}-#{Time.now.to_i}") unless File.exist?(".kitchen/#{instance.name}.lxd")
+            instance_name = File.read(".kitchen/#{instance.name}.lxd")
+          end
+          instance_name
+        end
+
         def exists?
-          `lxc info #{instance.name} > /dev/null 2>&1`
+          `lxc info #{@@instance_name} > /dev/null 2>&1`
           if $?.to_i == 0
-            debug("Container #{instance.name} exists")
+            debug("Container #{@@instance_name} exists")
             return true
           else
-            debug("Container #{instance.name} doesn't exist")
+            debug("Container #{@@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
+          status = `lxc info #{@@instance_name}`.match(/Status: ([a-zA-Z]+)[\n]/).captures[0].upcase
           if status == "RUNNING"
-            debug("Container #{instance.name} is running")
+            debug("Container #{@@instance_name} is running")
             return true
           else
-            debug("Container #{instance.name} isn't running")
+            debug("Container #{@@instance_name} isn't running")
             return false
           end
         end
@@ -121,7 +140,6 @@ module Kitchen
             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
@@ -157,11 +175,11 @@ module Kitchen
               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"
+              raise "Image #{publish_image_name} already exists!  If you wish to overwrite it set publish_image_overwrite: true in kitchen yaml"
             end
           end
           info("Publishing image #{publish_image_name}")
-          run_lxc_command("publish #{instance.name} --alias #{publish_image_name}")
+          run_lxc_command("publish #{@@instance_name} --alias #{publish_image_name}")
         end
 
         def get_image_name
@@ -200,14 +218,14 @@ module Kitchen
 
           if config[:ipv4]
             IO.popen("bash", "r+") do |p|
-              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("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"
+            arg_disable_dhcp = "&& lxc exec #{@@instance_name} -- sed -i 's/dhcp/manual/g' /etc/network/interfaces.d/eth0.cfg"
           end
 
-          info("Starting container #{instance.name}")
-          run_lxc_command("start #{instance.name} #{arg_disable_dhcp}")
+          info("Starting container #{@@instance_name}")
+          run_lxc_command("start #{@@instance_name} #{arg_disable_dhcp}")
           setup_mount_bindings if config[:mount].class == Hash
         end
 
@@ -252,13 +270,13 @@ module Kitchen
                 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]}")
+              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
 
         def configure_dns
-          IO.popen("lxc exec #{instance.name} bash", "r+") do |p|
+          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"
@@ -273,7 +291,7 @@ module Kitchen
             end if config[:ipv4] && dns_servers.length == 0
 
             if dns_servers.length > 0
-              if system "lxc exec #{instance.name} -- test -e /etc/redhat-release"
+              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", ' '))
@@ -304,13 +322,13 @@ module Kitchen
         end
 
         def setup_ssh_access
-          info("Setting up public key #{config[:public_key_path]} on #{instance.name}")
+          info("Setting up public key #{config[:public_key_path]} on #{@@instance_name}")
           unless config[:username] == "root"
              create_ssh_user
-             info("Checking /home/#{config[:username]}/.ssh on #{instance.name}")
+             info("Checking /home/#{config[:username]}/.ssh on #{@@instance_name}")
              wait_for_path("/home/#{config[:username]}/.ssh")
           else
-             info("Check /#{config[:username]}/.ssh on #{instance.name}")
+             info("Check /#{config[:username]}/.ssh on #{@@instance_name}")
              wait_for_path("/#{config[:username]}/.ssh")
           end
 
@@ -322,20 +340,20 @@ module Kitchen
               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}`
+            `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
 
-          debug("Finished Copying public key from #{config[:public_key_path]} to #{instance.name}")
+          debug("Finished Copying public key from #{config[:public_key_path]} to #{@@instance_name}")
         end
 
         def create_ssh_user
-          info("Create user #{config[:username]} on #{instance.name}")
-          `lxc exec #{instance.name} -- useradd -m -G sudo #{config[:username]} -s /bin/bash`
-          `lxc exec #{instance.name} -- mkdir /home/#{config[:username]}/.ssh`
-          `lxc exec #{instance.name} -- chown #{config[:username]}:#{config[:username]} /home/#{config[:username]}/.ssh`
-          `lxc exec #{instance.name} -- sh -c "echo '#{config[:username]} ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"`
+          info("Create user #{config[:username]} on #{@@instance_name}")
+          `lxc exec #{@@instance_name} -- useradd -m -G sudo #{config[:username]} -s /bin/bash`
+          `lxc exec #{@@instance_name} -- mkdir /home/#{config[:username]}/.ssh`
+          `lxc exec #{@@instance_name} -- chown #{config[:username]}:#{config[:username]} /home/#{config[:username]}/.ssh`
+          `lxc exec #{@@instance_name} -- sh -c "echo '#{config[:username]} ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"`
         end
 
         def install_proxy
@@ -381,7 +399,7 @@ module Kitchen
         def wait_for_ip_address
           info("Waiting for network to become ready")
           begin
-            lxc_info = `lxc info #{instance.name}`.match(/eth0:\tinet\t(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/)
+            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
@@ -394,7 +412,7 @@ module Kitchen
         def wait_for_path(path)
           begin
             debug("Waiting for #{path} to become available...")
-            run_lxc_command("exec #{instance.name} -- ls #{path} > /dev/null 2>&1")
+            run_lxc_command("exec #{@@instance_name} -- ls #{path} > /dev/null 2>&1")
             break if $?.to_i == 0
             sleep 0.3
           end while true
@@ -430,7 +448,7 @@ module Kitchen
        def configure_ip_via_lxc_restart
          debug("Configuring new ip address on eth0")
 
-         IO.popen("lxc exec #{instance.name} bash", "r+") do |p|
+         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')
@@ -452,13 +470,13 @@ module Kitchen
            end
            p.puts("exit")
          end
-         debug("Finished configuring new ip address, restarting #{instance.name} for settings to take effect")
+         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")
+         debug("Restarting #{@@instance_name}")
+         run_lxc_command("restart #{@@instance_name}")
+         debug("Finished restarting #{@@instance_name} ip address should be configured")
        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 = "2.0.0"
+    LXD_CLI_VERSION = "2.0.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-lxd_cli
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Braden Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen