From db93930987daef6e1c4488938ada843f820f4289 Mon Sep 17 00:00:00 2001 From: elijah Date: Sun, 16 Mar 2014 16:19:43 -0700 Subject: attempt number 7 to fix ssh problems. --- lib/leap_cli/commands/shell.rb | 3 ++- lib/leap_cli/version.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/leap_cli/commands/shell.rb b/lib/leap_cli/commands/shell.rb index 13c5003..2ccb3de 100644 --- 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 83b1c39..a7f3b6d 100644 --- 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.' -- cgit v1.2.3