diff options
author | Matt Martz <matt@sivel.net> | 2021-01-11 00:36:05 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-11 00:36:05 -0600 |
commit | 511ffdeff79844c2125d8e4438738e7f1d045598 (patch) | |
tree | c9debef9fa3dd279d65e28f33d9169116aa9b1bd | |
parent | 82b75282fc5fe2678f45e1dae512f341435648bb (diff) | |
download | ansible-511ffdeff79844c2125d8e4438738e7f1d045598.tar.gz |
[stable-2.10] Fix reset_connection paramiko, winrm, psrp (#72688) (#72925)
* Ensure we only reset the connection when one has been previously established. Fixes #65812
* Ensure psrp doesn't trace
* winrm too
* Indentation fix
(cherry picked from commit a3b6485)
Co-authored-by: Matt Martz <matt@sivel.net>
-rw-r--r-- | changelogs/fragments/65812-paramiko-attribute-error.yml | 3 | ||||
-rw-r--r-- | lib/ansible/plugins/connection/paramiko_ssh.py | 2 | ||||
-rw-r--r-- | lib/ansible/plugins/connection/psrp.py | 2 | ||||
-rw-r--r-- | lib/ansible/plugins/connection/winrm.py | 2 | ||||
-rwxr-xr-x | test/integration/targets/connection/test.sh | 2 | ||||
-rw-r--r-- | test/integration/targets/connection/test_reset_connection.yml | 5 |
6 files changed, 16 insertions, 0 deletions
diff --git a/changelogs/fragments/65812-paramiko-attribute-error.yml b/changelogs/fragments/65812-paramiko-attribute-error.yml new file mode 100644 index 0000000000..be95fe9d57 --- /dev/null +++ b/changelogs/fragments/65812-paramiko-attribute-error.yml @@ -0,0 +1,3 @@ +bugfixes: +- paramiko connection plugin - Ensure we only reset the connection when one has been + previously established (https://github.com/ansible/ansible/issues/65812) diff --git a/lib/ansible/plugins/connection/paramiko_ssh.py b/lib/ansible/plugins/connection/paramiko_ssh.py index 96a76d6746..62861094be 100644 --- a/lib/ansible/plugins/connection/paramiko_ssh.py +++ b/lib/ansible/plugins/connection/paramiko_ssh.py @@ -536,6 +536,8 @@ class Connection(ConnectionBase): f.write("%s %s %s\n" % (hostname, keytype, key.get_base64())) def reset(self): + if not self._connected: + return self.close() self._connect() diff --git a/lib/ansible/plugins/connection/psrp.py b/lib/ansible/plugins/connection/psrp.py index 9fab96935f..38a6259bcd 100644 --- a/lib/ansible/plugins/connection/psrp.py +++ b/lib/ansible/plugins/connection/psrp.py @@ -407,6 +407,8 @@ class Connection(ConnectionBase): return self def reset(self): + if not self._connected: + return display.vvvvv("PSRP: Reset Connection", host=self._psrp_host) self.runspace = None self._connect() diff --git a/lib/ansible/plugins/connection/winrm.py b/lib/ansible/plugins/connection/winrm.py index 3a1bc3d412..cd4645746b 100644 --- a/lib/ansible/plugins/connection/winrm.py +++ b/lib/ansible/plugins/connection/winrm.py @@ -520,6 +520,8 @@ class Connection(ConnectionBase): return self def reset(self): + if not self._connected: + return self.protocol = None self.shell_id = None self._connect() diff --git a/test/integration/targets/connection/test.sh b/test/integration/targets/connection/test.sh index 18fb2b776f..ad672e23c6 100755 --- a/test/integration/targets/connection/test.sh +++ b/test/integration/targets/connection/test.sh @@ -21,3 +21,5 @@ then else echo "SUCCESS: Connection vars not found" fi + +ansible-playbook test_reset_connection.yml -i "${INVENTORY}" "$@" diff --git a/test/integration/targets/connection/test_reset_connection.yml b/test/integration/targets/connection/test_reset_connection.yml new file mode 100644 index 0000000000..2f6cb8dcd6 --- /dev/null +++ b/test/integration/targets/connection/test_reset_connection.yml @@ -0,0 +1,5 @@ +- hosts: "{{ target_hosts }}" + gather_facts: no + tasks: + # https://github.com/ansible/ansible/issues/65812 + - meta: reset_connection |