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

Add option to disable ControlPath to ssh options during rsync

Browse source 
Fixes #8473
This commit is contained in:
James Cammarata 2014-08-18 12:59:00 -05:00
parent e3895840d1
commit e2b8f05b79
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
library/files/synchronize
View file

@ -303,17 +303,18 @@ def main():
else: else:
private_key = '-i '+ private_key private_key = '-i '+ private_key
ssh_opts = '-S none -o StrictHostKeyChecking=no'
if dest_port != 22: if dest_port != 22:
cmd += " --rsh '%s %s -o %s -o Port=%s'" % ('ssh', private_key, cmd += " --rsh 'ssh %s %s -o Port=%s'" % (private_key, ssh_opts, dest_port)
'StrictHostKeyChecking=no', dest_port)
else: else:
cmd += " --rsh '%s %s -o %s'" % ('ssh', private_key, cmd += " --rsh 'ssh %s %s'" % (private_key, ssh_opts) # need ssh param
'StrictHostKeyChecking=no') # need ssh param
if rsync_path: if rsync_path:
cmd = cmd + " --rsync-path=%s" % (rsync_path) cmd = cmd + " --rsync-path=%s" % (rsync_path)
if rsync_opts: if rsync_opts:
cmd = cmd + " " + " ".join(rsync_opts) cmd = cmd + " " + " ".join(rsync_opts)
changed_marker = '<<CHANGED>>' changed_marker = '<<CHANGED>>'
cmd = cmd + " --out-format='" + changed_marker + "%i %n%L'" cmd = cmd + " --out-format='" + changed_marker + "%i %n%L'"