From fc1d2c29be6b19b9ee19c063e15f72283140ec8e Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Fri, 10 Jul 2015 13:55:00 -0600 Subject: [PATCH] Use the same ssh args for ssh with a command as ssh exec --- lib/vagrant/action/builtin/ssh_run.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/vagrant/action/builtin/ssh_run.rb b/lib/vagrant/action/builtin/ssh_run.rb index d4058e6e4..e4522d1f0 100644 --- a/lib/vagrant/action/builtin/ssh_run.rb +++ b/lib/vagrant/action/builtin/ssh_run.rb @@ -20,8 +20,9 @@ module Vagrant end def call(env) - # Grab the SSH info from the machine - info = env[:machine].ssh_info + # Grab the SSH info from the machine or the environment + info = env[:ssh_info] + info ||= env[:machine].ssh_info # If the result is nil, then the machine is telling us that it is # not yet ready for SSH, so we raise this exception.