wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't use pipelining when ANSIBLE_KEEP_REMOTE_FILES is enabled

Browse source
This commit is contained in:
James Cammarata 2014-01-15 16:01:03 -06:00
parent df13b19fe1
commit 36e6709771
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/runner/__init__.py
View file

@ -309,7 +309,8 @@ class Runner(object):
if (module_style != 'new'
or async_jid is not None
or not conn.has_pipelining):
or not conn.has_pipelining
or C.DEFAULT_KEEP_REMOTE_FILES):
self._transfer_str(conn, tmp, module_name, module_data)
environment_string = self._compute_environment_string(inject)
@ -352,7 +353,7 @@ class Runner(object):
cmd = " ".join([str(x) for x in [remote_module_path, async_jid, async_limit, async_module, argsfile]])
else:
if async_jid is None:
if conn.has_pipelining:
if conn.has_pipelining and not C.DEFAULT_KEEP_REMOTE_FILES:
in_data = module_data
else:
cmd = "%s" % (remote_module_path)
@ -796,8 +797,9 @@ class Runner(object):
if tmp.find("tmp") != -1:
# tmp has already been created
return False
if not conn.has_pipelining:
if not conn.has_pipelining or C.DEFAULT_KEEP_REMOTE_FILES:
# tmp is necessary to store the module source code
# or we want to keep the files on the target system
return True
if module_style != "new":
# even when conn has pipelining, old style modules need tmp to store arguments