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

Merge pull request #1249 from rhartkopf/ssh_args_fix

Browse source 
synchronize: don't add ssh_args to ssh_opts when false or null
This commit is contained in:
Brian Coca 2015-05-04 11:17:44 -04:00
commit 0e4d1045af
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
files/synchronize.py
View file

@ -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: