cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #5587 from kormoc/fix_git_check_hostkey_etc

Browse source 
Fixes for git module
This commit is contained in:
jctanner 2014-01-12 13:00:58 -08:00
commit 2f5fe5f7c9
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/ansible/module_utils/known_hosts.py
View file

@ -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:
rc, out, err = add_host_key(module, fqdn)
if rc != 0:
module.fail_json(msg="failed to add %s hostkey: %s" % (fqdn, out + err))
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)
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))
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