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

Merge pull request #6406 from markus-perl/5186 

#5186: Warning: Authentication failure. Retrying... after packaging box
This commit is contained in:
Seth Vargo 2015-11-18 16:23:44 -08:00
parent 0ce636d1a3 61466c8e65
commit 42d0c3637c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/providers/virtualbox/provider.rb
View File

@ -68,12 +68,20 @@ module VagrantPlugins
# If the VM is not running that we can't possibly SSH into it # If the VM is not running that we can't possibly SSH into it
return nil if state.id != :running return nil if state.id != :running
# If the insecure key was automatically replaced with a newly generated key pair,
# use this key to connect to the machine
private_key_path = nil
if @machine.data_dir.join("private_key").file?
private_key_path = @machine.data_dir.join("private_key")
end
# Return what we know. The host is always "127.0.0.1" because # Return what we know. The host is always "127.0.0.1" because
# VirtualBox VMs are always local. The port we try to discover # VirtualBox VMs are always local. The port we try to discover
# by reading the forwarded ports. # by reading the forwarded ports.
return { return {
host: "127.0.0.1", host: "127.0.0.1",
port: @driver.ssh_port(@machine.config.ssh.guest_port) port: @driver.ssh_port(@machine.config.ssh.guest_port),
private_key_path: private_key_path
} }
end end