Merge branch 'fetch' of https://github.com/bpennypacker/ansible into bpennypacker-fetch

pull/4420/head
James Cammarata 2013-09-16 05:39:48 -05:00
commit d9cf1dfefb
2 changed files with 12 additions and 3 deletions

View File

@ -50,6 +50,8 @@ class ActionModule(object):
flat = utils.boolean(flat)
fail_on_missing = options.get('fail_on_missing', False)
fail_on_missing = utils.boolean(fail_on_missing)
validate_md5 = options.get('validate_md5', True)
validate_md5 = utils.boolean(validate_md5)
if source is None or dest is None:
results = dict(failed=True, msg="src and dest are required")
return ReturnData(conn=conn, result=results)
@ -112,10 +114,10 @@ class ActionModule(object):
f.write(remote_data)
f.close()
new_md5 = utils.md5(dest)
if new_md5 != remote_md5:
result = dict(failed=True, md5sum=new_md5, msg="md5 mismatch", file=source, dest=dest)
if validate_md5 and new_md5 != remote_md5:
result = dict(failed=True, md5sum=new_md5, msg="md5 mismatch", file=source, dest=dest, remote_md5sum=remote_md5)
return ReturnData(conn=conn, result=result)
result = dict(changed=True, md5sum=new_md5, dest=dest)
result = dict(changed=True, md5sum=new_md5, dest=dest, remote_md5sum=remote_md5)
return ReturnData(conn=conn, result=result)
else:
result = dict(changed=False, md5sum=local_md5, file=source, dest=dest)

View File

@ -34,6 +34,13 @@ options:
required: false
choices: [ "yes", "no" ]
default: "no"
validate_md5:
version_added: "1.3"
description:
- Verify that the source and destination md5sums match after the files are fetched.
required: false
choices: [ "yes", "no" ]
default: "yes"
flat:
version_added: "1.2"
description: