Commit 946c37fd by Brian Coca

Merge pull request #10612 from sivel/sync-ssh-args

Add ability to specify using ssh_args in synchronize
parents 8574d40b d5eb4df2
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
import os.path import os.path
from ansible import utils from ansible import utils
from ansible import constants
from ansible.runner.return_data import ReturnData from ansible.runner.return_data import ReturnData
import ansible.utils.template as template import ansible.utils.template as template
...@@ -104,9 +105,11 @@ class ActionModule(object): ...@@ -104,9 +105,11 @@ class ActionModule(object):
src = options.get('src', None) src = options.get('src', None)
dest = options.get('dest', None) dest = options.get('dest', None)
use_ssh_args = options.pop('use_ssh_args', None)
src = template.template(self.runner.basedir, src, inject) src = template.template(self.runner.basedir, src, inject)
dest = template.template(self.runner.basedir, dest, inject) dest = template.template(self.runner.basedir, dest, inject)
use_ssh_args = template.template(self.runner.basedir, use_ssh_args, inject)
try: try:
options['local_rsync_path'] = inject['ansible_rsync_path'] options['local_rsync_path'] = inject['ansible_rsync_path']
...@@ -187,6 +190,8 @@ class ActionModule(object): ...@@ -187,6 +190,8 @@ class ActionModule(object):
options['dest'] = dest options['dest'] = dest
if 'mode' in options: if 'mode' in options:
del options['mode'] del options['mode']
if use_ssh_args:
options['ssh_args'] = constants.ANSIBLE_SSH_ARGS
# Allow custom rsync path argument. # Allow custom rsync path argument.
rsync_path = options.get('rsync_path', None) rsync_path = options.get('rsync_path', None)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment