use GlobalKnownHostsFile for rsync and ssh instead of UserKnownHostsFile.

diff --git a/lib/leap_cli/commands/shell.rb b/lib/leap_cli/commands/shell.rb
index 81019041355ab604f3a3967b517456494bef731f..a84c671bc7827685a5b7e20b1724fed9b0b460e8 100644 (file)
--- a/lib/leap_cli/commands/shell.rb
+++ b/lib/leap_cli/commands/shell.rb
@@ -5,7 +5,7 @@ module LeapCli; module Commands
   command :shell, :ssh do |c|
     c.action do |global_options,options,args|
       node = get_node_from_args(args)
-      exec "ssh -l root -o 'HostName=#{node.ip_address}' -o 'HostKeyAlias=#{node.name}' -o 'UserKnownHostsFile=#{path(:known_hosts)}' -o 'StrictHostKeyChecking=yes' -p #{node.ssh.port} #{node.name}"
+      exec "ssh -l root -o 'HostName=#{node.ip_address}' -o 'HostKeyAlias=#{node.name}' -o 'GlobalKnownHostsFile=#{path(:known_hosts)}' -o 'StrictHostKeyChecking=yes' -p #{node.ssh.port} #{node.name}"
     end
   end
 

diff --git a/lib/leap_cli/commands/util.rb b/lib/leap_cli/commands/util.rb
index d9e69232d54ce8073d087061d8de674bc80bdc06..164ce0d90ae4e064a65e83d575cee6bb1d1c8e52 100644 (file)
--- a/lib/leap_cli/commands/util.rb
+++ b/lib/leap_cli/commands/util.rb
@@ -93,7 +93,7 @@ module LeapCli; module Commands
   def ssh_options
     {
       :config => false,
-      :user_known_hosts_file => path(:known_hosts),
+      :global_known_hosts_file => path(:known_hosts),
       :paranoid => true
     }
   end

diff --git a/vendor/supply_drop/lib/supply_drop/rsync.rb b/vendor/supply_drop/lib/supply_drop/rsync.rb
index 735665320978475a773ecd2a6a64e75a658219d3..30300380d3ee7df66f8d3f30b4a8f583f0c0a575 100644 (file)
--- a/vendor/supply_drop/lib/supply_drop/rsync.rb
+++ b/vendor/supply_drop/lib/supply_drop/rsync.rb
@@ -32,6 +32,7 @@ module SupplyDrop
           when :config then "-F #{value}"
           when :port then "-p #{value}"
           when :user_known_hosts_file then "-o 'UserKnownHostsFile=#{value}'"
+          when :global_known_hosts_file then "-o 'GlobalKnownHostsFile=#{value}'"
           when :host_key_alias then "-o 'HostKeyAlias=#{value}'"
           when :paranoid then "-o 'StrictHostKeyChecking=yes'"
           when :host_name then "-o 'HostName=#{value}'"