From f431b4817b5ec4f2e130c425774d70cc3a3316ba Mon Sep 17 00:00:00 2001
From: Matt Martz <matt@sivel.net>
Date: Fri, 3 Apr 2015 09:42:23 -0500
Subject: [PATCH 1/2] Add ability to specify using ssh_args in synchronize

---
 files/synchronize.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/files/synchronize.py b/files/synchronize.py
index d29a900593b..623c1c0015d 100644
--- a/files/synchronize.py
+++ b/files/synchronize.py
@@ -138,6 +138,13 @@ options:
       - put user@ for the remote paths. If you have a custom ssh config to define the remote user for a host
         that does not match the inventory user, you should set this parameter to "no".
     default: yes
+  use_ssh_args:
+    description:
+      - Use the ssh_args specified in ansible.cfg
+    default: "yes"
+    choices:
+      - "yes"
+      - "no"
   rsync_opts:
     description:
       - Specify additional rsync options by passing in an array.
@@ -227,7 +234,8 @@ def main():
             group = dict(type='bool'),
             set_remote_user = dict(default='yes', type='bool'),
             rsync_timeout = dict(type='int', default=0),
-            rsync_opts = dict(type='list')
+            rsync_opts = dict(type='list'),
+            ssh_args = dict(type='str'),
         ),
         supports_check_mode = True
     )
@@ -254,6 +262,7 @@ def main():
     owner = module.params['owner']
     group = module.params['group']
     rsync_opts = module.params['rsync_opts']
+    ssh_args = module.params['ssh_args']
 
     cmd = '%s --delay-updates -F' % rsync
     if compress:
@@ -306,7 +315,7 @@ def main():
     else:
         private_key = '-i '+ private_key 
 
-    ssh_opts = '-S none -o StrictHostKeyChecking=no'
+    ssh_opts = '-S none -o StrictHostKeyChecking=no %s' % ssh_args
     if dest_port != 22:
         cmd += " --rsh 'ssh %s %s -o Port=%s'" % (private_key, ssh_opts, dest_port)
     else:

From ba7ad8e7f564710d37baa85cb2e61754cf7ccfb3 Mon Sep 17 00:00:00 2001
From: Matt Martz <matt@sivel.net>
Date: Fri, 3 Apr 2015 10:27:33 -0500
Subject: [PATCH 2/2] Add version_added for the use_ssh_args option

---
 files/synchronize.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/synchronize.py b/files/synchronize.py
index 623c1c0015d..f2dbf1b4961 100644
--- a/files/synchronize.py
+++ b/files/synchronize.py
@@ -145,6 +145,7 @@ options:
     choices:
       - "yes"
       - "no"
+    version_added: "2.0"
   rsync_opts:
     description:
       - Specify additional rsync options by passing in an array.