mirror of
https://github.com/ansible-collections/ansible.posix.git
synced 2026-01-12 15:45:20 +01:00
Compare commits
13 commits
b6396f5ee9
...
28415159f1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
28415159f1 | ||
|
|
a072f0b2ef | ||
|
|
c8790770da | ||
|
|
d5f7cf0b22 | ||
|
|
01f599cd7a | ||
|
|
fd4e362d16 | ||
|
|
f5088453d2 | ||
|
|
39930cac21 | ||
|
|
8ceac49534 | ||
|
|
afe4ec8334 | ||
|
|
112fe9e9d0 | ||
|
|
6e96120b14 | ||
|
|
5149c41229 |
3 changed files with 57 additions and 8 deletions
|
|
@ -0,0 +1,2 @@
|
||||||
|
minor_changes:
|
||||||
|
- synchronize - add the ``quiet`` option to suppress output messages (https://github.com/ansible-collections/ansible.posix/issues/171).
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
from __future__ import absolute_import, division, print_function
|
from __future__ import absolute_import, division, print_function
|
||||||
__metaclass__ = type
|
__metaclass__ = type
|
||||||
|
|
||||||
|
|
||||||
DOCUMENTATION = r'''
|
DOCUMENTATION = r'''
|
||||||
---
|
---
|
||||||
module: synchronize
|
module: synchronize
|
||||||
|
|
@ -186,6 +185,12 @@ options:
|
||||||
type: bool
|
type: bool
|
||||||
default: yes
|
default: yes
|
||||||
version_added: '1.3.0'
|
version_added: '1.3.0'
|
||||||
|
quiet:
|
||||||
|
description:
|
||||||
|
- This option specifies quiet option which on true suppresses the output.
|
||||||
|
type: bool
|
||||||
|
default: no
|
||||||
|
version_added: '1.3.0'
|
||||||
|
|
||||||
notes:
|
notes:
|
||||||
- rsync must be installed on both the local and remote host.
|
- rsync must be installed on both the local and remote host.
|
||||||
|
|
@ -343,6 +348,12 @@ EXAMPLES = r'''
|
||||||
src: /tmp/localpath/
|
src: /tmp/localpath/
|
||||||
dest: /tmp/remotepath
|
dest: /tmp/remotepath
|
||||||
rsync_path: /usr/gnu/bin/rsync
|
rsync_path: /usr/gnu/bin/rsync
|
||||||
|
|
||||||
|
- name: Synchronization with quiet option enabled
|
||||||
|
ansible.posix.synchronize:
|
||||||
|
src: some/relative/path
|
||||||
|
dest: /some/absolute/path
|
||||||
|
quiet: yes
|
||||||
'''
|
'''
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -419,6 +430,7 @@ def main():
|
||||||
delay_updates=dict(type='bool', default=True),
|
delay_updates=dict(type='bool', default=True),
|
||||||
mode=dict(type='str', default='push', choices=['pull', 'push']),
|
mode=dict(type='str', default='push', choices=['pull', 'push']),
|
||||||
link_dest=dict(type='list', elements='str'),
|
link_dest=dict(type='list', elements='str'),
|
||||||
|
quiet=dict(type='bool', default=False)
|
||||||
),
|
),
|
||||||
supports_check_mode=True,
|
supports_check_mode=True,
|
||||||
)
|
)
|
||||||
|
|
@ -459,6 +471,7 @@ def main():
|
||||||
verify_host = module.params['verify_host']
|
verify_host = module.params['verify_host']
|
||||||
link_dest = module.params['link_dest']
|
link_dest = module.params['link_dest']
|
||||||
delay_updates = module.params['delay_updates']
|
delay_updates = module.params['delay_updates']
|
||||||
|
quiet = module.params['quiet']
|
||||||
|
|
||||||
if '/' not in rsync:
|
if '/' not in rsync:
|
||||||
rsync = module.get_bin_path(rsync, required=True)
|
rsync = module.get_bin_path(rsync, required=True)
|
||||||
|
|
@ -621,14 +634,17 @@ def main():
|
||||||
out_lines = out_clean.split('\n')
|
out_lines = out_clean.split('\n')
|
||||||
while '' in out_lines:
|
while '' in out_lines:
|
||||||
out_lines.remove('')
|
out_lines.remove('')
|
||||||
if module._diff:
|
|
||||||
diff = {'prepared': out_clean}
|
|
||||||
return module.exit_json(changed=changed, msg=out_clean,
|
|
||||||
rc=rc, cmd=cmdstr, stdout_lines=out_lines,
|
|
||||||
diff=diff)
|
|
||||||
|
|
||||||
return module.exit_json(changed=changed, msg=out_clean,
|
result = dict(changed=changed, rc=rc, cmd=cmdstr, stdout_lines=out_lines, msg=out_clean)
|
||||||
rc=rc, cmd=cmdstr, stdout_lines=out_lines)
|
|
||||||
|
if quiet:
|
||||||
|
changes = out.count(changed_marker) if changed else 0
|
||||||
|
result['msg'] = "%s files/directories have been synchronized" % changes
|
||||||
|
|
||||||
|
if module._diff:
|
||||||
|
result['diff'] = {'prepared': out_clean}
|
||||||
|
|
||||||
|
return module.exit_json(**result)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
|
||||||
|
|
@ -265,3 +265,34 @@
|
||||||
- directory_a/foo.txt
|
- directory_a/foo.txt
|
||||||
- directory_a
|
- directory_a
|
||||||
- directory_b
|
- directory_b
|
||||||
|
- name: synchronize files with quiet option
|
||||||
|
synchronize:
|
||||||
|
src: '{{ output_dir }}/foo.txt'
|
||||||
|
dest: '{{ output_dir }}/foo.result'
|
||||||
|
quiet: true
|
||||||
|
register: sync_result
|
||||||
|
- assert:
|
||||||
|
that:
|
||||||
|
- '''files/directories have been synchronized'' in sync_result.msg'
|
||||||
|
- name: Cleanup
|
||||||
|
file:
|
||||||
|
state: absent
|
||||||
|
path: '{{ output_dir }}/{{ item }}'
|
||||||
|
loop:
|
||||||
|
- foo.result
|
||||||
|
- bar.result
|
||||||
|
- name: synchronize files without quiet option
|
||||||
|
synchronize:
|
||||||
|
src: '{{ output_dir }}/foo.txt'
|
||||||
|
dest: '{{ output_dir }}/foo.result'
|
||||||
|
register: sync_result
|
||||||
|
- assert:
|
||||||
|
that:
|
||||||
|
- '''files/directories have been synchronized'' not in sync_result.msg'
|
||||||
|
- name: Cleanup
|
||||||
|
file:
|
||||||
|
state: absent
|
||||||
|
path: '{{ output_dir }}/{{ item }}'
|
||||||
|
loop:
|
||||||
|
- foo.result
|
||||||
|
- bar.result
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue