attempt number 7 to fix ssh problems.

diff --git a/lib/leap_cli/commands/shell.rb b/lib/leap_cli/commands/shell.rb
index 13c5003905b87572e3c66a636fb1cf27854178b2..2ccb3ded18f93f3feff694bd55be05eb7771b086 100644 (file)
--- a/lib/leap_cli/commands/shell.rb
+++ b/lib/leap_cli/commands/shell.rb
@@ -47,13 +47,14 @@ module LeapCli; module Commands
   def exec_ssh(cmd, args)
     node = get_node_from_args(args, :include_disabled => true)
     options = [
-      "-o 'HostName=#{node.domain.full}'",
+      "-o 'HostName=#{node.ip_address}'",
       # "-o 'HostKeyAlias=#{node.name}'", << oddly incompatible with ports in known_hosts file, so we must not use this or non-standard ports break.
       "-o 'GlobalKnownHostsFile=#{path(:known_hosts)}'",
       "-o 'UserKnownHostsFile=/dev/null'"
     ]
     if node.vagrant?
       options << "-i #{vagrant_ssh_key_file}"    # use the universal vagrant insecure key
+      options << "-o IdentitiesOnly=yes"         # force the use of the insecure vagrant key
       options << "-o 'StrictHostKeyChecking=no'" # blindly accept host key and don't save it (since userknownhostsfile is /dev/null)
     else
       options << "-o 'StrictHostKeyChecking=yes'"

diff --git a/lib/leap_cli/version.rb b/lib/leap_cli/version.rb
index 83b1c396311141c5f76dd9ab9db3fef680f95373..a7f3b6d2bc078d042cfeb15648dbb22fcbaa0b97 100644 (file)
--- a/lib/leap_cli/version.rb
+++ b/lib/leap_cli/version.rb
@@ -1,6 +1,6 @@
 module LeapCli
   unless defined?(LeapCli::VERSION)
-    VERSION = '1.5.0'
+    VERSION = '1.5.1'
     COMPATIBLE_PLATFORM_VERSION = '0.3.0'..'1.99'
     SUMMARY = 'Command line interface to the LEAP platform'
     DESCRIPTION = 'The command "leap" can be used to manage a bevy of servers running the LEAP platform from the comfort of your own home.'