Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support ansible for remote servers and vm #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

support ansible for remote servers and vm #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f516019
support ansible for remote servers and vm
pronix Aug 24, 2016
2ebbfdf
changes after review
pronix Sep 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions plugins/provisioners/ansible/provisioner/host.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,9 @@ def prepare_ansible_ssh_args

proxy_cmd += " exec nc %h %p 2>/dev/null"

ssh_options << "-o ProxyCommand='#{ proxy_cmd }'"
elsif @machine.ssh_info[:proxy_command] && @machine.provider_config.connect_via_ssh
proxy_cmd = @machine.ssh_info[:proxy_command]
ssh_options << "-o ProxyCommand='#{ proxy_cmd }'"
end

Expand Down