synchronize: don't add ssh_args to ssh_opts when false or null

10 years ago · 118382ca70
parent 2e9462aa21
commit 118382ca70
1 changed files with 5 additions and 1 deletions
--- a/lib/ansible/modules/files/synchronize.py
+++ b/lib/ansible/modules/files/synchronize.py
@ -316,7 +316,11 @@ def main():
    else:
        private_key = '-i '+ private_key 

-    ssh_opts = '-S none -o StrictHostKeyChecking=no %s' % ssh_args
+    if ssh_args:
+      ssh_opts = '-S none -o StrictHostKeyChecking=no %s' % ssh_args
+    else:
+      ssh_opts = '-S none -o StrictHostKeyChecking=no'
+
    if dest_port != 22:
        cmd += " --rsh 'ssh %s %s -o Port=%s'" % (private_key, ssh_opts, dest_port)
    else: