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

use self.host which will always be updated (#74574)

Browse source 
* use self.host which will always be updated

  pc remote_addr is not correctly updated in all cases
This commit is contained in:
Brian Coca 2021-05-11 14:49:56 -04:00 committed by GitHub
parent 8d1cf7f266
commit 2c93b22043
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/ssh_cleanup.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- ssh connection, use self.host which has the most up2date info instead of pc.remote_addr

4
lib/ansible/plugins/connection/ssh.py
View file

@ -601,7 +601,7 @@ class Connection(ConnectionBase):
were added. It will be displayed with a high enough verbosity.
.. note:: This function does its work via side-effect. The b_command list has the new arguments appended.
"""
display.vvvvv(u'SSH: %s: (%s)' % (explanation, ')('.join(to_text(a) for a in b_args)), host=self._play_context.remote_addr)
display.vvvvv(u'SSH: %s: (%s)' % (explanation, ')('.join(to_text(a) for a in b_args)), host=self.host)
b_command += b_args
def _build_command(self, binary, subsystem, *other_args):
@ -1232,7 +1232,7 @@ class Connection(ConnectionBase):
super(Connection, self).exec_command(cmd, in_data=in_data, sudoable=sudoable)
display.vvv(u"ESTABLISH SSH CONNECTION FOR USER: {0}".format(self.user), host=self._play_context.remote_addr)
display.vvv(u"ESTABLISH SSH CONNECTION FOR USER: {0}".format(self.user), host=self.host)
if getattr(self._shell, "_IS_WINDOWS", False):
# Become method 'runas' is done in the wrapper that is executed,