net-ssh 2.1.0. Adds "IdentitiesOnly" support for net-ssh, fixing prob…

…lems.

CHANGELOG.md

@@ -1,6 +1,8 @@
 ## 0.7.1 (unreleased)
 
   - Change error output with references to VirtualBox 3.2 to 4.0.
+  - Internal SSH through net-ssh now uses `IdentitiesOnly` thanks to
+    upstream net-ssh fix.
 
 ## 0.7.0 (January 19, 2011)
 

lib/vagrant/ssh.rb

@@ -70,6 +70,7 @@ def execute(opts={})
         Net::SSH.start(env.config.ssh.host,
                        env.config.ssh.username,
                        opts.merge( :keys => [env.config.ssh.private_key_path],
+                                   :keys_only => true,
                                    :user_known_hosts_file => [],
                                    :paranoid => false,
                                    :config => false)) do |ssh|

test/vagrant/ssh_test.rb

@@ -147,6 +147,7 @@ def ssh_exec_expect(port, key_path, uname, host)
         assert_equal @env.config.ssh.username, username
         assert_equal @ssh.port, opts[:port]
         assert_equal [@env.config.ssh.private_key_path], opts[:keys]
+        assert opts[:keys_only]
         true
       end
       @ssh.execute

vagrant.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency "erubis", "~> 2.6.6"
   s.add_dependency "json", "~> 1.4.6"
   s.add_dependency "mario", "~> 0.0.6"
-  s.add_dependency "net-ssh", "~> 2.0.23"
+  s.add_dependency "net-ssh", "~> 2.1.0"
   s.add_dependency "net-scp", "~> 1.0.4"
   s.add_dependency "i18n", "~> 0.5.0"
   s.add_dependency "thor", "~> 0.14.6"