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

win_reboot: Fix for ignore post_reboot_delay (#46360)

Browse source 
* win_reboot: Fix for ignore post_reboot_delay

This fixes an issue where win_reboot would be ignoring the provided
post_reboot_delay (and on Windows timing/waiting is everything!)

This must be backported to the v2.7 branch.

* Merge post-reboot handling into run()
This commit is contained in:
Dag Wieers 2018-10-04 21:44:50 +02:00 committed by Sam Doran
parent b570af020c
commit 8c64b4af7c
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/ansible/plugins/action/reboot.py
View file

@ -1,5 +1,5 @@
# (c) 2016-2018, Matt Davis <mdavis@ansible.com> # Copyright: (c) 2016-2018, Matt Davis <mdavis@ansible.com>
# (c) 2018, Sam Doran <sdoran@redhat.com> # Copyright: (c) 2018, Sam Doran <sdoran@redhat.com>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
from __future__ import (absolute_import, division, print_function) from __future__ import (absolute_import, division, print_function)
@ -11,8 +11,8 @@ import time
from datetime import datetime, timedelta from datetime import datetime, timedelta
from ansible.errors import AnsibleError from ansible.errors import AnsibleError
from ansible.plugins.action import ActionBase
from ansible.module_utils._text import to_native, to_text from ansible.module_utils._text import to_native, to_text
from ansible.plugins.action import ActionBase
try: try:
@ -230,14 +230,6 @@ class ActionModule(ActionBase):
except AnsibleError: except AnsibleError:
display.debug("%s: connect_timeout connection option has not been set" % self._task.action) display.debug("%s: connect_timeout connection option has not been set" % self._task.action)
post_reboot_delay = int(self._task.args.get('post_reboot_delay', self._task.args.get('post_reboot_delay_sec', self.DEFAULT_POST_REBOOT_DELAY)))
if post_reboot_delay < 0:
post_reboot_delay = 0
if post_reboot_delay != 0:
display.vvv("%s: waiting an additional %d seconds" % (self._task.action, post_reboot_delay))
time.sleep(post_reboot_delay)
return result return result
def validate_reboot(self): def validate_reboot(self):
@ -313,6 +305,14 @@ class ActionModule(ActionBase):
result['elapsed'] = elapsed.seconds result['elapsed'] = elapsed.seconds
return result return result
post_reboot_delay = int(self._task.args.get('post_reboot_delay', self._task.args.get('post_reboot_delay_sec', self.DEFAULT_POST_REBOOT_DELAY)))
if post_reboot_delay < 0:
post_reboot_delay = 0
if post_reboot_delay != 0:
display.vvv("%s: waiting an additional %d seconds" % (self._task.action, post_reboot_delay))
time.sleep(post_reboot_delay)
# Make sure reboot was successful # Make sure reboot was successful
result = self.validate_reboot() result = self.validate_reboot()

6
lib/ansible/plugins/action/win_reboot.py
View file

@ -1,4 +1,4 @@
# (c) 2018, Matt Davis <mdavis@ansible.com> # Copyright: (c) 2018, Matt Davis <mdavis@ansible.com>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
from __future__ import (absolute_import, division, print_function) from __future__ import (absolute_import, division, print_function)
@ -7,8 +7,8 @@ __metaclass__ = type
from datetime import datetime from datetime import datetime
from ansible.errors import AnsibleError from ansible.errors import AnsibleError
from ansible.plugins.action import ActionBase
from ansible.module_utils._text import to_native from ansible.module_utils._text import to_native
from ansible.plugins.action import ActionBase
from ansible.plugins.action.reboot import ActionModule as RebootActionModule from ansible.plugins.action.reboot import ActionModule as RebootActionModule
try: try:
@ -29,9 +29,9 @@ class ActionModule(RebootActionModule, ActionBase):
'reboot_timeout', 'reboot_timeout_sec', 'shutdown_timeout', 'shutdown_timeout_sec', 'test_command', 'reboot_timeout', 'reboot_timeout_sec', 'shutdown_timeout', 'shutdown_timeout_sec', 'test_command',
)) ))
DEFAULT_BOOT_TIME_COMMAND = "(Get-WmiObject -ClassName Win32_OperatingSystem).LastBootUpTime"
DEFAULT_CONNECT_TIMEOUT = 5 DEFAULT_CONNECT_TIMEOUT = 5
DEFAULT_PRE_REBOOT_DELAY = 2 DEFAULT_PRE_REBOOT_DELAY = 2
DEFAULT_BOOT_TIME_COMMAND = "(Get-WmiObject -ClassName Win32_OperatingSystem).LastBootUpTime"
DEFAULT_SHUTDOWN_COMMAND_ARGS = '/r /t %d /c "%s"' DEFAULT_SHUTDOWN_COMMAND_ARGS = '/r /t %d /c "%s"'
DEFAULT_SUDOABLE = False DEFAULT_SUDOABLE = False