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

Merge pull request #5928 from mitchellh/sethvargo/ssh_exec_run_command 

Use the same ssh args for ssh with a command as ssh exec
This commit is contained in:
Seth Vargo 2015-07-27 11:02:36 -04:00
parent 1813d7addb fc1d2c29be
commit d64d229c0f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/vagrant/action/builtin/ssh_run.rb
View File

@ -20,8 +20,9 @@ module Vagrant
end end
def call(env) def call(env)
# Grab the SSH info from the machine # Grab the SSH info from the machine or the environment
info = env[:machine].ssh_info info = env[:ssh_info]
info ||= env[:machine].ssh_info
# If the result is nil, then the machine is telling us that it is # If the result is nil, then the machine is telling us that it is
# not yet ready for SSH, so we raise this exception. # not yet ready for SSH, so we raise this exception.