From a0936221d7f949762c1cdab5dc6a1e65e53aa214 Mon Sep 17 00:00:00 2001 From: Timothy Appnel Date: Thu, 11 Jul 2013 20:08:46 -0400 Subject: [PATCH] Fixed identity key logic. --- network/synchronize | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/network/synchronize b/network/synchronize index fd979b74074..016abd3734e 100644 --- a/network/synchronize +++ b/network/synchronize @@ -99,10 +99,6 @@ def main(): rsync = module.params.get('local_rsync_path', 'rsync') temp = os.path.dirname(os.path.realpath(__file__)) - if not private_key and ('@' in dest or '@' in source): - return module.fail_json(msg='A private key is required for remote connections.' - ) - cmd = '%s --archive --delay-updates --compress' % rsync if verbosity: cmd = '%s -%s' % (cmd, 'v' * int(verbosity)) @@ -112,8 +108,11 @@ def main(): cmd = cmd + ' --temp-dir ' + temp if module.boolean(delete): cmd = cmd + ' --delete-after' - if private_key: - cmd = cmd + " --rsh '%s -i %s -o %s'" % ('ssh', private_key, + if private_key is None: + private_key = '' + else: + private_key = '-i '+ private_key + cmd = cmd + " --rsh '%s %s -o %s'" % ('ssh', private_key, 'StrictHostKeyChecking=no') # need ssh param if rsync_path: cmd = cmd + ' --rsync-path ' + rsync_path