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

Merge pull request #6581 from mitchellh/gildegoma/fix-winrm-ssl-portforwarding-overrides 

"Split" the handling of WinRM port forwarding rules (plaintext, ssl)
This commit is contained in:
Shawn Neal 2015-11-23 10:13:23 -08:00
parent 75faa43b7f 68d9708ca7
commit c1acbec55e
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -416,7 +416,8 @@ module VagrantPlugins
host_ip: "127.0.0.1",
id: "winrm",
auto_correct: true
end
if !@__networks["forwarded_port-winrm-ssl"]
network :forwarded_port,
guest: 5986,
host: 55986,

14
test/unit/plugins/kernel_v2/config/vm_test.rb
View File

@ -204,25 +204,25 @@ describe VagrantPlugins::Kernel_V2::VMConfig do
it "allows overriding WinRM" do
subject.communicator = :winrm
subject.network "forwarded_port",
guest: 22, host: 14100, id: "winrm"
guest: 5985, host: 14100, id: "winrm"
subject.finalize!
winrm_network = find_network 'winrm'
expect(winrm_network[:guest]).to eq(22)
expect(winrm_network[:guest]).to eq(5985)
expect(winrm_network[:host]).to eq(14100)
expect(winrm_network[:id]).to eq("winrm")
end
it "allows overriding WinRM SSL" do
subject.communicator = :winrmssl
subject.communicator = :winrm
subject.network "forwarded_port",
guest: 22, host: 14100, id: "winrmssl"
guest: 5986, host: 14100, id: "winrm-ssl"
subject.finalize!
winrmssl_network = find_network 'winrmssl'
expect(winrmssl_network[:guest]).to eq(22)
winrmssl_network = find_network 'winrm-ssl'
expect(winrmssl_network[:guest]).to eq(5986)
expect(winrmssl_network[:host]).to eq(14100)
expect(winrmssl_network[:id]).to eq("winrmssl")
expect(winrmssl_network[:id]).to eq("winrm-ssl")
end
it "turns all forwarded port ports to ints" do