summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVern Burton <me@vernburton.com>2018-02-19 19:13:44 -0600
committerVern Burton <me@vernburton.com>2018-02-19 19:14:05 -0600
commit52e76ca30749d87ada0146d155c6c590db52a9a1 (patch)
treec4c2cc1b57f2ca89ac5a61c5a34dd063f2b190ed
parente079a1e2c6ad084ad01ffecfeb610beb7b448097 (diff)
downloadchef-52e76ca30749d87ada0146d155c6c590db52a9a1.tar.gz
updating paranoid to verify_host_key for net-ssh for 4.2 greater and updating gemspec.
This breaks net-ssh 4.1 and lowers backwards compatibility Signed-off-by: Vern Burton <me@vernburton.com>
-rw-r--r--chef.gemspec2
-rw-r--r--lib/chef/knife/ssh.rb2
2 files changed, 2 insertions, 2 deletions
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]