diff options
| author | Thom May <thom@may.lt> | 2018-02-20 16:24:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-20 16:24:30 +0000 |
| commit | 21fd3fae84ba79587233bc5b1493a82a44fcb947 (patch) | |
| tree | 0238c1eb3967f176f2756d4f90a23aa45e3ccba3 | |
| parent | 784f35984a8b50d6d9411c18fb399e5dcfb157ae (diff) | |
| parent | e7a919b0a228a15aa36578d2bb76d2d11e6f1dff (diff) | |
| download | chef-21fd3fae84ba79587233bc5b1493a82a44fcb947.tar.gz | |
Merge pull request #6869 from tarcinil/fix/6785
updating paranoid to verify_host_key
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | chef.gemspec | 2 | ||||
| -rw-r--r-- | lib/chef/knife/ssh.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 3795d740c9..d2e5f1c19b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -52,7 +52,7 @@ PATH mixlib-log (~> 1.3) mixlib-shellout (~> 2.0) net-sftp (~> 2.1, >= 2.1.2) - net-ssh (>= 2.9, < 5.0) + net-ssh (~> 4.2) net-ssh-multi (~> 1.2, >= 1.2.1) ohai (~> 14.0) plist (~> 3.2) @@ -83,7 +83,7 @@ PATH mixlib-log (~> 1.3) mixlib-shellout (~> 2.0) net-sftp (~> 2.1, >= 2.1.2) - net-ssh (>= 2.9, < 5.0) + net-ssh (~> 4.2) net-ssh-multi (~> 1.2, >= 1.2.1) ohai (~> 14.0) plist (~> 3.2) diff --git a/chef.gemspec b/chef.gemspec index 9dd85d74c6..352ce5dab0 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |s| s.add_dependency "ohai", "~> 14.0" s.add_dependency "ffi-yajl", "~> 2.2" - s.add_dependency "net-ssh", ">= 2.9", "< 5.0" + s.add_dependency "net-ssh", "~> 4.2" s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1" s.add_dependency "net-sftp", "~> 2.1", ">= 2.1.2" s.add_dependency "highline", "~> 1.6", ">= 1.6.9" diff --git a/lib/chef/knife/ssh.rb b/lib/chef/knife/ssh.rb index 885ebc4faa..e02ea4ae1d 100644 --- a/lib/chef/knife/ssh.rb +++ b/lib/chef/knife/ssh.rb @@ -273,7 +273,7 @@ class Chef opts[:port] = port unless port.nil? opts[:logger] = Chef::Log.logger if Chef::Log.level == :debug if !config[:host_key_verify] - opts[:paranoid] = false + opts[:verify_host_key] = false opts[:user_known_hosts_file] = "/dev/null" end if ssh_config[:keepalive] |