knife-joyent 0.4.11 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbe5b0c80211fc7f11c9442bce84cd0eefac2ceb
-  data.tar.gz: 7d0c7a4cc3dae56e13f8387712501ad38aafb9e2
+  metadata.gz: cbadbfdfac0b82475098817aa9df09ebffc045c6
+  data.tar.gz: fa9ce1e48f64143ec93718585e971d65dba56eb9
 SHA512:
-  metadata.gz: ec963568f5407fb9615a50c8581eb081832063f7134c14f89696175c36008d654ed19b49b84a6e8d1d1e874ae53d9ce96e5095b38026fbd0fdcd14ea68063fbe
-  data.tar.gz: 7951a60a59a017eda0a6a6d610b3ef9931408ff13f303091059fd926699539b7d1986c28c880b2ffbaf0091ebe9917e3a2e80ae6eb9ef4b45fd51be7a31bcd1e
+  metadata.gz: 05932dc50d37e0f493c7eb00f79e7080c4e0136e1f2e8f2de52909a3fb9cd6c0a845e2aaf841717ab773efd5c8d8c08ad7e3a0aa8b5b9bdba8805b7d90a051af
+  data.tar.gz: 112e490a67295fa28c799fb032fa6883e89975242a6eecfdeb2aef060a4307b3481b68437c60390f9ba2da6f2e3275acbd403e0b08f4b62c61c6a982fc2174c0

data/knife-joyent.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
-  s.add_dependency "fog", ">= 1.28.0"
+  s.add_dependency "fog", '~> 1.23'
   s.add_dependency "multi_json", "~> 1.7"
   s.add_dependency "joyent-cloud-pricing", ">= 1.1.0"
   s.add_dependency 'chef', '>= 11.16.2', '< 12.1'

data/lib/chef/knife/joyent_server_create.rb

@@ -262,7 +262,7 @@ class Chef
         bootstrap.config[:identity_file] = config[:identity_file]
         Chef::Log.debug("Bootstrap identity_file = #{bootstrap.config[:identity_file]}")
 
-        bootstrap.config[:ssh_gateway] = config[:ssh_gateway]
+        bootstrap.config[:ssh_gateway] = determine_ssh_gateway(bootstrap_ip)
         Chef::Log.debug("Bootstrap ssh_gateway= #{bootstrap.config[:ssh_gateway]}")
 
         bootstrap.config[:first_boot_attributes] = config[:json_attributes]
@@ -271,6 +271,34 @@ class Chef
         bootstrap
       end
 
+      # src: https://github.com/chef/knife-ec2/blob/master/lib/chef/knife/ec2_server_create.rb#L741-L770
+      def determine_ssh_gateway
+        # ssh_gateway config takes precedence over derived value
+        if config[:ssh_gateway]
+          Chef::Log.debug("Using ssh gateway #{config[:ssh_gateway]} from knife config")
+          return config[:ssh_gateway]
+        end
+
+        ssh_proxy = Net::SSH::Config.for(hostname)[:proxy]
+        if ssh_proxy.respond_to?(:command_line_template)
+          # ssh gateway_hostname nc %h %p
+          proxy_pattern = /ssh\s+(\S+)\s+nc/
+          matchdata = proxy_pattern.match(ssh_proxy.command_line_template)
+          if matchdata.nil?
+            Chef::Log.debug("Unable to determine ssh gateway for '#{hostname}' from ssh config template: #{ssh_proxy.command_line_template}")
+            nil
+          else
+            # Return hostname extracted from command line template
+            Chef::Log.debug("Using ssh gateway #{matchdata[1]} from ssh config")
+            matchdata[1]
+          end
+        else
+          # Return nil if we cannot find an ssh_gateway
+          Chef::Log.debug("No ssh gateway found, making a direct connection")
+          nil
+        end
+      end
+
       def determine_bootstrap_ip(server)
         server_ips = server.ips.select{ |ip|
           ip and not(is_loopback(ip) or is_linklocal(ip))

data/lib/knife-joyent/version.rb

@@ -1,3 +1,3 @@
 module KnifeJoyent
-  VERSION = "0.4.11"
+  VERSION = "0.4.12"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: knife-joyent
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors:
 - Kevin Chan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.28.0
+        version: '1.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.28.0
+        version: '1.23'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement