ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

auto call the file module after copy/template module usage in runner

Browse source 
note some changed=True/False detection bits in file module still need tweaking
This commit is contained in:
Michael DeHaan 2012-03-15 22:32:14 -04:00
parent 4ad885111b
commit 63818000b4
2 changed files with 41 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
lib/ansible/runner.py
View file

@ -376,8 +376,26 @@ class Runner(object):
# run the copy module # run the copy module
args = [ "src=%s" % tmp_src, "dest=%s" % dest ] args = [ "src=%s" % tmp_src, "dest=%s" % dest ]
result = self._execute_module(conn, tmp, module, args) result1 = self._execute_module(conn, tmp, module, args)
return self._return_from_module(conn, host, result) results1 = self._return_from_module(conn, host, result1)
(host, ok, data) = results1
# magically chain into the file module
if ok:
# unless failed, run the file module to adjust file aspects
old_changed = data.get('changed', False)
module = self._transfer_module(conn, tmp, 'file')
args = [ "%s=%s" % (k,v) for (k,v) in options.items() ]
result2 = self._execute_module(conn, tmp, module, args)
results2 = self._return_from_module(conn, host, result2)
(host, ok, data2) = results2
new_changed = data2.get('changed', False)
data['changed'] = old_changed or new_changed
data.update(data2)
return (host, ok, data)
else:
# copy failed, return orig result without going through 'file' module
return results1
# ***************************************************** # *****************************************************
@ -407,8 +425,26 @@ class Runner(object):
# run the template module # run the template module
args = [ "src=%s" % temppath, "dest=%s" % dest, "metadata=%s" % metadata ] args = [ "src=%s" % temppath, "dest=%s" % dest, "metadata=%s" % metadata ]
result = self._execute_module(conn, tmp, template_module, args) result1 = self._execute_module(conn, tmp, template_module, args)
return self._return_from_module(conn, host, result) results1 = self._return_from_module(conn, host, result1)
(host, ok, data) = results1
# magically chain into the file module
if ok:
# unless failed, run the file module to adjust file aspects
old_changed = data.get('changed', False)
module = self._transfer_module(conn, tmp, 'file')
args = [ "%s=%s" % (k,v) for (k,v) in options.items() ]
result2 = self._execute_module(conn, tmp, module, args)
results2 = self._return_from_module(conn, host, result2)
(host, ok, data2) = results2
new_changed = data2.get('changed', False)
data['changed'] = old_changed or new_changed
data.update(data2)
return (host, ok, data)
else:
# copy failed, return orig result without going through 'file' module
return results1
# ***************************************************** # *****************************************************

2
lib/ansible/utils.py
View file

@ -199,7 +199,7 @@ def parse_json(data):
raise AnsibleError("failed to parse: %s" % data) raise AnsibleError("failed to parse: %s" % data)
(key,value) = t.split("=", 1) (key,value) = t.split("=", 1)
if key == 'changed' or 'failed': if key == 'changed' or 'failed':
if value.lower() in [ 'true', '1' ] : if value.lower() in [ 'true', '1' ]:
value = True value = True
elif value.lower() in [ 'false', '0' ]: elif value.lower() in [ 'false', '0' ]:
value = False value = False