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.