ssh: modified yet again how ssh is used. pin to a newer version of capistrano that i think handles ~/.ssh/config better, and explicitly specify that ~/.ssh/config should be loaded for Net::SSH connections.

1 files changed, 2 insertions, 4 deletions

diff --git a/lib/leap_cli/util/remote_command.rb b/lib/leap_cli/util/remote_command.rb
index 07db416..6972bbb 100644
--- a/lib/leap_cli/util/remote_command.rb
+++ b/lib/leap_cli/util/remote_command.rb
@@ -50,8 +50,7 @@ module LeapCli; module Util; module RemoteCommand
   #
   def ssh_options
     {
-      :config => false,  # setting config to `false` is odd. however, if we don't do this, net:ssh doesn't use ssh-agent correctly,
-                         # for some unknown reason. also, with config `false`, it seems to still use ~/.ssh/config, so go figure.
+      :config => "~/.ssh/config",
       :global_known_hosts_file => path(:known_hosts),
       :user_known_hosts_file => '/dev/null',
       :paranoid => true
@@ -68,13 +67,12 @@ module LeapCli; module Util; module RemoteCommand
   #  return {:password => password_proc}
   #
   def node_options(node, ssh_options_override=nil)
-    ssh_options_override ||= {}
     {
       :ssh_options => {
         # :host_key_alias => node.name, << incompatible with ports in known_hosts
         :host_name => node.ip_address,
         :port => node.ssh.port
-      }.merge(contingent_ssh_options_for_node(node)).merge(ssh_options_override)
+      }.merge(contingent_ssh_options_for_node(node)).merge(ssh_options_override||{})
     }
   end