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

Add --blocking-io option when docker connection (#19140)

Browse source
This commit is contained in:
Chris Houseknecht 2016-12-10 09:20:35 -05:00 committed by GitHub
parent b1ea79af51
commit b02491ba70
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/plugins/action/synchronize.py
View file

@ -354,10 +354,13 @@ class ActionModule(ActionBase):
# If launching synchronize against docker container # If launching synchronize against docker container
# use rsync_opts to support container to override rsh options # use rsync_opts to support container to override rsh options
if self._remote_transport in [ 'docker' ]: if self._remote_transport in [ 'docker' ]:
if not isinstance(self._task.args.get('rsync_opts'), list):
self._task.args['rsync_opts'] = []
self._task.args['rsync_opts'].append('--blocking-io')
if user is not None: if user is not None:
self._task.args['rsync_opts'] = "--rsh='%s exec -u %s -i'" % (self._docker_cmd, user) self._task.args['rsync_opts'].append("--rsh='%s exec -u %s -i'" % (self._docker_cmd, user))
else: else:
self._task.args['rsync_opts'] = "--rsh='%s exec -i'" % (self._docker_cmd) self._task.args['rsync_opts'].append("--rsh='%s exec -i'" % self._docker_cmd)
# run the module and store the result # run the module and store the result
result.update(self._execute_module('synchronize', task_vars=task_vars)) result.update(self._execute_module('synchronize', task_vars=task_vars))