ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-25 20:01:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

changed winrm _reset to reset and make ssh reset show warning (#42651)

Browse source 
* changed winrm _reset to reset and make ssh reset show warning

* minor changelog update
This commit is contained in:
Jordan Borean 2018-07-12 13:22:01 +10:00 • committed by Matt Davis
parent a5fc9a17f0
commit d723b8541d
6 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -158,7 +158,7 @@ class ActionModule(ActionBase):
try:
self._connection.set_option("connection_timeout",
connect_timeout)
self._connection._reset()
self._connection.reset()
except AttributeError:
display.warning("Connection plugin does not allow the "
"connection timeout to be overridden")
@ -178,7 +178,7 @@ class ActionModule(ActionBase):
try:
self._connection.set_option("connection_timeout",
connection_timeout_orig)
self._connection._reset()
self._connection.reset()
except (AnsibleError, AttributeError) as e:
display.debug("Failed to reset connection_timeout back to default: %s" % to_native(e))
@ -192,7 +192,7 @@ class ActionModule(ActionBase):
# (another reboot occurred) we need to reset the connection
# to make sure we are not re-using the same shell id
try:
self._connection._reset()
self._connection.reset()
except AttributeError:
pass
raise