haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tweak timeouts so SSh detection works

This commit is contained in:
Mitchell Hashimoto 2011-12-11 16:41:51 -08:00
parent 48f0a50e61
commit ad03163eff
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/default.rb
View File

@ -9,7 +9,7 @@ Vagrant::Config.run do |config|
config.ssh.forwarded_port_key = "ssh" config.ssh.forwarded_port_key = "ssh"
config.ssh.forwarded_port_destination = 22 config.ssh.forwarded_port_destination = 22
config.ssh.max_tries = 100 config.ssh.max_tries = 100
config.ssh.timeout = 7 config.ssh.timeout = 10
config.ssh.forward_agent = false config.ssh.forward_agent = false
config.ssh.forward_x11 = false config.ssh.forward_x11 = false

3
lib/vagrant/ssh.rb
View File

@ -75,8 +75,6 @@ module Vagrant
# Connect to SSH and gather the session # Connect to SSH and gather the session
session = retryable(:tries => @vm.config.ssh.max_tries, :on => exceptions) do session = retryable(:tries => @vm.config.ssh.max_tries, :on => exceptions) do
sleep 4 # Hacky but helps with issue #391, #455, etc.
connection = Net::SSH.start(@vm.config.ssh.host, connection = Net::SSH.start(@vm.config.ssh.host,
@vm.config.ssh.username, @vm.config.ssh.username,
opts.merge( :keys => [private_key_path], opts.merge( :keys => [private_key_path],
@ -86,6 +84,7 @@ module Vagrant
:config => false)) :config => false))
sleep 4 # Hacky but helps with issue #391, #455, etc. sleep 4 # Hacky but helps with issue #391, #455, etc.
SSH::Session.new(connection, @vm) SSH::Session.new(connection, @vm)
end end