diff --git a/CHANGELOG.md b/CHANGELOG.md index bbeb458fa..17d2a6119 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ BUG FIXES: + - core: Allow overriding of the default SSH port. [GH-3474] - commands/box/remove: Make output nicer. [GH-3470] - commands/box/update: Show currently installed version. [GH-3467] - command/rsync-auto: Works properly on Windows. diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb index 30ab2ff3f..79e667f3b 100644 --- a/plugins/kernel_v2/config/vm.rb +++ b/plugins/kernel_v2/config/vm.rb @@ -341,7 +341,7 @@ module VagrantPlugins define(DEFAULT_VM_NAME) if defined_vm_keys.empty? # Make sure the SSH forwarding is added if it doesn't exist - if !@__networks["ssh"] + if !@__networks["forwarded_port-ssh"] network :forwarded_port, guest: 22, host: 2222, diff --git a/test/unit/plugins/kernel_v2/config/vm_test.rb b/test/unit/plugins/kernel_v2/config/vm_test.rb index 5b20e8c3e..b6be053c1 100644 --- a/test/unit/plugins/kernel_v2/config/vm_test.rb +++ b/test/unit/plugins/kernel_v2/config/vm_test.rb @@ -123,6 +123,19 @@ describe VagrantPlugins::Kernel_V2::VMConfig do expect(n[0][1][:id]).to eq("ssh") end + it "allows overriding SSH" do + subject.network "forwarded_port", + guest: 22, host: 14100, id: "ssh" + subject.finalize! + + n = subject.networks + expect(n.length).to eq(1) + expect(n[0][0]).to eq(:forwarded_port) + expect(n[0][1][:guest]).to eq(22) + expect(n[0][1][:host]).to eq(14100) + expect(n[0][1][:id]).to eq("ssh") + end + it "turns all forwarded port ports to ints" do subject.network "forwarded_port", guest: "45", host: "4545", id: "test"