Merge pull request #5587 from kormoc/fix_git_check_hostkey_etc

Fixes for git module

lib/ansible/module_utils/known_hosts.py

@@ -6,12 +6,13 @@ 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:
-            rc, out, err = add_host_key(module, fqdn)
+            if accept_hostkey:
-            if rc != 0:
+                rc, out, err = add_host_key(module, fqdn)
-                module.fail_json(msg="failed to add %s hostkey: %s" % (fqdn, out + err))
+                if rc != 0:
-        else:
+                    module.fail_json(msg="failed to add %s hostkey: %s" % (fqdn, out + err))
-            module.fail_json(msg="%s has an unknown hostkey. Set accept_hostkey to True or manually add the hostkey prior to running the git module" % fqdn)                    
+            else:
+                module.fail_json(msg="%s has an unknown hostkey. Set accept_hostkey to True or manually add the hostkey prior to running the git module" % fqdn)                    
 
 def get_fqdn(repo_url):
 
@@ -42,6 +43,14 @@ def check_hostkey(module, fqdn):
     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
 
     return result