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

For docker add --blocking-io only when missing (#19171)

Browse source
This commit is contained in:
Chris Houseknecht 2016-12-10 10:51:03 -05:00 committed by GitHub
parent 9f58e69d63
commit 65491cc839
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -355,8 +355,9 @@ class ActionModule(ActionBase):
# use rsync_opts to support container to override rsh options
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')
self._task.args['rsync_opts'] = self._task.args.get('rsync_opts', '').split(' ')
if '--blocking-io' not in self._task.args['rsync_opts']:
self._task.args['rsync_opts'].append('--blocking-io')
if user is not None:
self._task.args['rsync_opts'].append("--rsh='%s exec -u %s -i'" % (self._docker_cmd, user))
else: