Merge pull request #5587 from kormoc/fix_git_check_hostkey_etc

Fixes for git module

lib/ansible/module_utils/known_hosts.py

@@ -6,7 +6,8 @@ def add_git_host_key(module, url, accept_hostkey=True):
 
     if fqdn:
         known_host = check_hostkey(module, fqdn)
-        if not known_host and accept_hostkey:
+        if not known_host:
+            if accept_hostkey:
                 rc, out, err = add_host_key(module, fqdn)
                 if rc != 0:
                     module.fail_json(msg="failed to add %s hostkey: %s" % (fqdn, out + err))
@@ -39,6 +40,14 @@ def check_hostkey(module, fqdn):
     this_cmd = keygen_cmd + " -H -F " + fqdn
     rc, out, err = module.run_command(this_cmd)
 
+    if rc == 0:
+        if out != "":
+            result = True
+    else:
+        # Check the main system location
+        this_cmd = keygen_cmd + " -H -f /etc/ssh/ssh_known_hosts -F " + fqdn
+        rc, out, err = module.run_command(this_cmd)
+
         if rc == 0:
             if out != "":
                 result = True