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

Cascade ssh_*args configurations in synchronize instead of limiting to just ssh_args. See https://github.com/ansible/ansible-modules-core/issues/3370

Browse source
This commit is contained in:
Matt Martz 2016-04-06 10:27:24 -05:00
parent edab8d338d
commit bce79c67c3
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -318,7 +318,12 @@ class ActionModule(ActionBase):
self._task.args['rsync_path'] = '"%s"' % rsync_path self._task.args['rsync_path'] = '"%s"' % rsync_path
if use_ssh_args: if use_ssh_args:
self._task.args['ssh_args'] = C.ANSIBLE_SSH_ARGS ssh_args = [
getattr(self._play_context, 'ssh_args', ''),
getattr(self._play_context, 'ssh_common_args', ''),
getattr(self._play_context, 'ssh_extra_args', ''),
]
self._task.args['ssh_args'] = ' '.join([a for a in ssh_args if a])
# 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))