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

synchronize: add flag for verifying target host.

Browse source 
Add the possibility to verify the target host using a "verify_host"
flag. It is disabled by default to not change the module behaviour.
This commit is contained in:
Patrik Lundin 2015-07-19 12:45:31 +02:00 committed by Matt Clay
parent 7a6c8251dd
commit 88881415e9
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/ansible/modules/files/synchronize.py
View file

@ -158,6 +158,12 @@ options:
default: no default: no
required: false required: false
version_added: "2.0" version_added: "2.0"
verify_host:
description:
- Verify destination host key.
default: no
required: false
version_added: "2.0"
notes: notes:
- `rsync` must be installed on both the local and remote machine. - `rsync` must be installed on both the local and remote machine.
- Inspect the verbose output to validate the destination user/host/path - Inspect the verbose output to validate the destination user/host/path
@ -244,6 +250,7 @@ def main():
rsync_opts = dict(type='list'), rsync_opts = dict(type='list'),
ssh_args = dict(type='str'), ssh_args = dict(type='str'),
partial = dict(default='no', type='bool'), partial = dict(default='no', type='bool'),
verify_host = dict(default='no', type='bool'),
), ),
supports_check_mode = True supports_check_mode = True
) )
@ -272,6 +279,7 @@ def main():
group = module.params['group'] group = module.params['group']
rsync_opts = module.params['rsync_opts'] rsync_opts = module.params['rsync_opts']
ssh_args = module.params['ssh_args'] ssh_args = module.params['ssh_args']
verify_host = module.params['verify_host']
cmd = '%s --delay-updates -F' % rsync cmd = '%s --delay-updates -F' % rsync
if compress: if compress:
@ -324,10 +332,13 @@ def main():
else: else:
private_key = '-i '+ private_key private_key = '-i '+ private_key
ssh_opts = '-S none'
if not verify_host:
ssh_opts = '%s -o StrictHostKeyChecking=no' % ssh_opts
if ssh_args: if ssh_args:
ssh_opts = '-S none -o StrictHostKeyChecking=no %s' % ssh_args ssh_opts = '%s %s' % (ssh_opts, ssh_args)
else:
ssh_opts = '-S none -o StrictHostKeyChecking=no'
if dest_port != 22: if dest_port != 22:
cmd += " --rsh 'ssh %s %s -o Port=%s'" % (private_key, ssh_opts, dest_port) cmd += " --rsh 'ssh %s %s -o Port=%s'" % (private_key, ssh_opts, dest_port)