Add support for passing ssh config file in via config

This commit is contained in:
Gavin Williams 2018-09-27 11:16:50 +01:00 committed by Chris Roberts
parent eeecd258f8
commit 87437317dc
3 changed files with 6 additions and 1 deletions

View File

@ -376,7 +376,7 @@ module VagrantPlugins
# Build the options we'll use to initiate the connection via Net::SSH
common_connect_opts = {
auth_methods: auth_methods,
config: false,
config: ssh_info[:config],
forward_agent: ssh_info[:forward_agent],
send_env: ssh_info[:forward_env],
keys_only: ssh_info[:keys_only],

View File

@ -5,6 +5,7 @@ require_relative "ssh_connect"
module VagrantPlugins
module Kernel_V2
class SSHConfig < SSHConnectConfig
attr_accessor :config
attr_accessor :forward_agent
attr_accessor :forward_x11
attr_accessor :forward_env
@ -22,6 +23,7 @@ module VagrantPlugins
def initialize
super
@config = UNSET_VALUE
@forward_agent = UNSET_VALUE
@forward_x11 = UNSET_VALUE
@forward_env = UNSET_VALUE
@ -46,6 +48,7 @@ module VagrantPlugins
def finalize!
super
@config = false if @config == UNSET_VALUE
@forward_agent = false if @forward_agent == UNSET_VALUE
@forward_x11 = false if @forward_x11 == UNSET_VALUE
@forward_env = false if @forward_env == UNSET_VALUE

View File

@ -8,6 +8,8 @@ describe VagrantPlugins::Kernel_V2::SSHConfig do
describe "#default" do
it "defaults to vagrant username" do
subject.finalize!
expect(subject.default.config).to eq(false)
expect(subject.default.port).to eq(22)
expect(subject.default.username).to eq("vagrant")
end
end