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

Merge pull request #6539 from mitchellh/revert-6406-5186 

Revert "#5186: Warning: Authentication failure. Retrying... after packaging box"
This commit is contained in:
Seth Vargo 2015-11-18 16:35:42 -08:00
parent 6af1f1e258 e9f4bca380
commit 17ebc7fca6
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,20 +68,12 @@ module VagrantPlugins
# If the VM is not running that we can't possibly SSH into it
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
# VirtualBox VMs are always local. The port we try to discover
# by reading the forwarded ports.
return {
host: "127.0.0.1",
port: @driver.ssh_port(@machine.config.ssh.guest_port),
private_key_path: private_key_path
port: @driver.ssh_port(@machine.config.ssh.guest_port)
}
end