Merge branch 'win_reboot-fix' of git://github.com/dagwieers/ansible into HEAD

This commit is contained in:
Matt Davis 2017-01-16 14:11:27 -08:00
commit c8970fc4e6
2 changed files with 18 additions and 4 deletions

View file

@ -57,21 +57,23 @@ options:
description:
- Message to display to users
default: Reboot initiated by Ansible
notes:
- If a shutdown was already scheduled on the system, C(win_reboot) will abort the scheduled shutdown and enforce its own shutdown.
author:
- Matt Davis (@nitzmahone)
'''
EXAMPLES='''
# unconditionally reboot the machine with all defaults
# Unconditionally reboot the machine with all defaults
- win_reboot:
# apply updates and reboot if necessary
# Apply updates and reboot if necessary
- win_updates:
register: update_result
- win_reboot:
when: update_result.reboot_required
# reboot a slow machine that might have lots of updates to apply
# Reboot a slow machine that might have lots of updates to apply
- win_reboot:
shutdown_timeout_sec: 3600
reboot_timeout_sec: 3600