internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 13:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Matt Davis
2017-01-16 14:11:27 -08:00
parent 4b6201ce0d 239e2ae7e9
commit c8970fc4e6
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/ansible/plugins/action/win_reboot.py
View File

@@ -83,9 +83,21 @@ class ActionModule(ActionBase):
result = super(ActionModule, self).run(tmp, task_vars)
# initiate reboot
# Initiate reboot
(rc, stdout, stderr) = self._connection.exec_command('shutdown /r /t %d /c "%s"' % (pre_reboot_delay_sec, msg))
# Test for "A system shutdown has already been scheduled. (1190)" and handle it gracefully
if rc == 1190:
result['warnings'] = ( 'A scheduled reboot was pre-empted by Ansible.' )
# Try to abort (this may fail if it was already aborted)
(rc, stdout1, stderr1) = self._connection.exec_command('shutdown /a')
# Initiate reboot again
(rc, stdout2, stderr2) = self._connection.exec_command('shutdown /r /t %d' % pre_reboot_delay_sec)
stdout += stdout1 + stdout2
stderr += stderr1 + stderr2
if rc != 0:
result['failed'] = True
result['rebooted'] = False