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

Remove transport_test for some connection types (#28450)

Browse source 
So we are removing the transport_test for the listed connection types,
because they fail to take into account bastion or proxy servers for
testing the transport.

The result of removing this, is that modules using this facility will do
a complete round-trip attempt, running a module, which is a bit heavier but correct.

This fixes #23774
This commit is contained in:
Dag Wieers 2017-08-26 01:16:40 +02:00 • committed by GitHub
parent bdba5982d2
commit 1afbe29642
3 changed files with 0 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/plugins/connection/paramiko_ssh.py
View file

@ -130,14 +130,6 @@ class Connection(ConnectionBase):
transport = 'paramiko' transport = 'paramiko'
def transport_test(self, connect_timeout):
''' Test the transport mechanism, if available '''
host = self._play_context.remote_addr
port = int(self._play_context.port or 22)
display.vvv("attempting transport test to %s:%s" % (host, port))
sock = socket.create_connection((host, port), connect_timeout)
sock.close()
def _cache_key(self): def _cache_key(self):
return "%s__%s__" % (self._play_context.remote_addr, self._play_context.remote_user) return "%s__%s__" % (self._play_context.remote_addr, self._play_context.remote_user)

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

@ -260,13 +260,6 @@ class Connection(ConnectionBase):
def _connect(self): def _connect(self):
return self return self
def transport_test(self, connect_timeout):
''' Test the transport mechanism, if available '''
port = int(self.port or 22)
display.vvv("attempting transport test to %s:%s" % (self.host, port))
sock = socket.create_connection((self.host, port), connect_timeout)
sock.close()
@staticmethod @staticmethod
def _create_control_path(host, port, user, connection=None): def _create_control_path(host, port, user, connection=None):
'''Make a hash for the controlpath based on con attributes''' '''Make a hash for the controlpath based on con attributes'''

8
lib/ansible/plugins/connection/winrm.py
View file

@ -90,14 +90,6 @@ class Connection(ConnectionBase):
super(Connection, self).__init__(*args, **kwargs) super(Connection, self).__init__(*args, **kwargs)
def transport_test(self, connect_timeout):
''' Test the transport mechanism, if available '''
host = self._winrm_host
port = int(self._winrm_port)
display.vvv("attempting transport test to %s:%s" % (host, port))
sock = socket.create_connection((host, port), connect_timeout)
sock.close()
def set_host_overrides(self, host, hostvars=None): def set_host_overrides(self, host, hostvars=None):
''' '''
Override WinRM-specific options from host variables. Override WinRM-specific options from host variables.