summaryrefslogtreecommitdiff
path: root/lib/chef/knife/ssh.rb
diff options
context:
space:
mode:
authorJose Asuncion <jose.asuncion@gmail.com>2017-09-25 17:00:51 -0700
committerJose Asuncion <jose.asuncion@gmail.com>2017-09-25 17:02:56 -0700
commitd3cf74513829347db86f451cdd3ecc06bab01072 (patch)
tree52bb0cd7e26b15226db7cd60893a8bffb782acb5 /lib/chef/knife/ssh.rb
parentbdf090c43e46a1aeec80c6b495c6858f9c2d6300 (diff)
parent87feda303b3d8e0bb4fc08b6f7642b44f82c075d (diff)
downloadchef-d3cf74513829347db86f451cdd3ecc06bab01072.tar.gz
Merge branch 'master' into feat/5556
Signed-off-by: Jose Asuncion <jeunito@gmail.com>
Diffstat (limited to 'lib/chef/knife/ssh.rb')
-rw-r--r--lib/chef/knife/ssh.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/chef/knife/ssh.rb b/lib/chef/knife/ssh.rb
index 380a60fdd6..ae14ce9954 100644
--- a/lib/chef/knife/ssh.rb
+++ b/lib/chef/knife/ssh.rb
@@ -273,6 +273,10 @@ class Chef
opts[:paranoid] = false
opts[:user_known_hosts_file] = "/dev/null"
end
+ if ssh_config[:keepalive]
+ opts[:keepalive] = true
+ opts[:keepalive_interval] = ssh_config[:keepalive_interval]
+ end
end
end