kitchen-linode 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 198c98c7ff9a1c80bb355e61914dafda2b5e23ea
-  data.tar.gz: 2d9a0a9d1997743deff97d46671d0bb6dcec19a3
+  metadata.gz: 721f77582e4f5220860cdfc0b07a58ece05360ad
+  data.tar.gz: 16ba66a9d1f5bc84e5ca5f75b9bd5fcc071a6566
 SHA512:
-  metadata.gz: a68a46f8e6e36c56b8044ec1e1307f2bc402d39b4d244c83e8b9d3e6ae166677967e5680c9b590ff1d96e753bab41e4940e861b7d88346a987e07e928e4788ed
-  data.tar.gz: 422acc48129a8342977e1c12455d8b7a857de0dbbf14c6e1c3a9f750d1a4e4363c338cd86a0fe128ba269c88a6203371dc5f2943dc4bf9b301ea3626b276ab1a
+  metadata.gz: 500c0f06315b5265aaa38ff63075f185a7f84ae8dae5cfffc768d15e5d85d6482b0fca90a309c65cc4756f0e0796ac44861e0b1b367fb90231eb7d4940daf0ec
+  data.tar.gz: 49c617d270a94a2f652d83139fbc77a965ceb71b06d927bdfc0a1603dcc3150b5ededb65c910de0c34deae1a783a5bdacb39080e2101a51909e9640aeae371c5

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.6.0
+
+* added an info line
+
+## 0.5.0
+
+* added loop to retry initial ssh session on Linode
+
+## 0.4.0
+
+* set default ssh timeout to 600 seconds
+* added some more information lines
+
 ## 0.3.0
 
 * added option for ssh timeout, set default to 60 seconds

data/lib/kitchen/driver/linode.rb

@@ -32,12 +32,12 @@ module Kitchen
       
       default_config :username, 'root'
       default_config :password, nil
-      default_config(:image) { |driver| driver.default_image }
-      default_config :data_center, 1
-      default_config :flavor, 1
+      default_config :image, "Debian 8.1"
+      default_config :data_center, "Atlanta"
+      default_config :flavor, "Linode 1024"
       default_config :payment_terms, 1
       default_config :ssh_key_name, nil
-      default_config :kernel, 215
+      default_config :kernel, "Latest 64 bit"
       
       default_config :sudo, true
       default_config :port, 22
@@ -96,7 +96,7 @@ module Kitchen
       
       def create_server
         if config[:password].nil?
-          config[:password] = [*('a'..'z'),*('0'..'9')].shuffle[0,20].join
+          config[:password] = [*('a'..'z'),*('A'..'Z'),*('0'..'9')].shuffle[0,20].join
         end
         
         # set datacenter
@@ -135,7 +135,7 @@ module Kitchen
         else
           image = compute.images.find { |i| i.name == config[:image] }
           if image.nil?
-            image = compute.images.find { |i| i.name == /#{config[:image]}/ }
+            image = compute.images.find { |i| i.name =~ /#{config[:image]}/ }
           end
         end
         if config[:image].nil?
@@ -148,7 +148,7 @@ module Kitchen
         else
           kernel = compute.kernels.find { |k| k.name == config[:kernel] }
           if kernel.nil?
-            kernel = compute.kernels.find { |k| k.name == /#{config[:kernel]}/ }
+            kernel = compute.kernels.find { |k| k.name =~ /#{config[:kernel]}/ }
           end
         end
         if config[:kernel].nil?
@@ -176,25 +176,38 @@ module Kitchen
       end
       
       def setup_ssh(server, state)
-        info "Using public SSH key <#{config[:public_key_path]}>"
-        info "Using private SSH key <#{config[:private_key_path]}>"
         state[:ssh_key] = config[:private_key_path]
-        do_ssh_setup(state, config, server)
+        do_ssh_setup(state, config)
       end
 
-      def do_ssh_setup(state, config, server)
+      def do_ssh_setup(state, config)
         info "Setting up SSH access for key <#{config[:public_key_path]}>"
-        info "Connecting <#{config[:username]}@#{state[:hostname]}>"
+        info "Connecting <#{config[:username]}@#{state[:hostname]}>..."
         ssh = Fog::SSH.new(state[:hostname],
                            config[:username],
-                           password: config[:password],
-                           timeout: config[:ssh_timeout])
+                           :password => config[:password],
+                           :timeout => config[:ssh_timeout])
         pub_key = open(config[:public_key_path]).read
-        ssh.run([
-          %(mkdir .ssh),
-          %(echo "#{pub_key}" >> ~/.ssh/authorized_keys),
-          %(passwd -l #{config[:username]})
-        ])
+        @max_interval = 60
+        @max_retries = 10
+        @retries = 0
+        begin
+          ssh.run([
+            %(mkdir .ssh),
+            %(echo "#{pub_key}" >> ~/.ssh/authorized_keys),
+            %(passwd -l #{config[:username]})
+          ])
+        rescue
+          @retries ||= 0
+          if @retries < @max_retries
+            info "Retrying connection..."
+            sleep [2**(@retries - 1), @max_interval].min
+            @retries += 1
+            retry
+          else
+            raise
+          end
+        end
         info "Done setting up SSH access."
       end
       

data/lib/kitchen/driver/linode_version.rb

@@ -20,6 +20,6 @@ module Kitchen
 
   module Driver
     # Version string for Linode Kitchen driver
-    LINODE_VERSION = "0.4.0"
+    LINODE_VERSION = "0.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-linode
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Brett Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen