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

changes after review

This commit is contained in:
Dmitry Vasilets 2016-09-19 21:00:14 +02:00 committed by Gilles Cornu
parent a943f67da1
commit a1d78edaf8
No known key found for this signature in database
GPG Key ID: F6BC2CF7E1FE8FFF
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/provisioners/ansible/provisioner/host.rb
View File

@ -234,7 +234,7 @@ module VagrantPlugins
proxy_cmd += " exec nc %h %p 2>/dev/null" proxy_cmd += " exec nc %h %p 2>/dev/null"
ssh_options << "-o ProxyCommand='#{ proxy_cmd }'" ssh_options << "-o ProxyCommand='#{ proxy_cmd }'"
elsif @machine.provider_name == :libvirt && @machine.provider_config.connect_via_ssh elsif @machine.ssh_info[:proxy_command] && @machine.provider_config.connect_via_ssh
proxy_cmd = @machine.ssh_info[:proxy_command] proxy_cmd = @machine.ssh_info[:proxy_command]
ssh_options << "-o ProxyCommand='#{ proxy_cmd }'" ssh_options << "-o ProxyCommand='#{ proxy_cmd }'"
end end