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

kernel/v2: Reimplement 8655d21 to always forward SSH 

Fixes #7202
Always forwards SSH even if WinRM is set
This commit is contained in:
Kierran McPherson 2016-05-04 12:04:25 +12:00 committed by Kierran McPherson
parent f19e33524d
commit 3bff55034a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/kernel_v2/config/vm.rb
View File

@ -425,7 +425,9 @@ module VagrantPlugins
id: "winrm-ssl", id: "winrm-ssl",
auto_correct: true auto_correct: true
end end
elsif !@__networks["forwarded_port-ssh"] end
# forward SSH ports regardless of communicator
if !@__networks["forwarded_port-ssh"]
network :forwarded_port, network :forwarded_port,
guest: 22, guest: 22,
host: 2222, host: 2222,