Commit 288d9e01 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Merge branch 'stable-2.1' into devel-2.1

* stable-2.1:
  Fix ssh host key checking with no-key-check
parents 82869978 e66d9f1a
......@@ -114,10 +114,15 @@ class SshRunner:
else:
options.append("-oStrictHostKeyChecking=no")
elif ask_key:
options.extend([
"-oStrictHostKeyChecking=ask",
])
else:
# non-batch mode
if ask_key:
options.append("-oStrictHostKeyChecking=ask")
elif strict_host_check:
options.append("-oStrictHostKeyChecking=yes")
else:
options.append("-oStrictHostKeyChecking=no")
return options
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment