From 790e3051e460b6c595146bcfa63c0b7d378b56db Mon Sep 17 00:00:00 2001 From: Florian LACOMMARE Date: Mon, 7 Nov 2022 16:15:21 +0100 Subject: [PATCH] Postpone ssh config parsing file when connecting to device for doing token substitution at that time Signed-off-by: Florian LACOMMARE --- suzieq/poller/worker/nodes/node.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/suzieq/poller/worker/nodes/node.py b/suzieq/poller/worker/nodes/node.py index 02367ab377..2274806239 100644 --- a/suzieq/poller/worker/nodes/node.py +++ b/suzieq/poller/worker/nodes/node.py @@ -557,11 +557,6 @@ async def _init_jump_host_connection( options=jump_host_options, known_hosts=None ) - if self.ssh_config_file: - jump_host_options = asyncssh.SSHClientConnectionOptions( - options=jump_host_options, - config_file=[self.ssh_config_file] - ) else: jump_host_options = options @@ -573,7 +568,8 @@ async def _init_jump_host_connection( ) self._tunnel = await asyncssh.connect( self.jump_host, port=self.jump_port, - options=jump_host_options, username=self.jump_user) + options=jump_host_options, username=self.jump_user, + config=[self.ssh_config_file]) self.logger.info( 'Connection to jump host %s succeeded', self.jump_host) @@ -605,11 +601,6 @@ def _init_ssh_options(self) -> asyncssh.SSHClientConnectionOptions: options=options, known_hosts=None, ) - if self.ssh_config_file: - options = asyncssh.SSHClientConnectionOptions( - options=options, - config=[self.ssh_config_file], - ) return options @@ -729,7 +720,8 @@ async def _ssh_connect(self): self.address, username=self.username, port=self.port, - options=options) + options=options, + config=[self.ssh_config_file]) self.logger.info( f"Connected to {self.address}:{self.port} at " f"{time.time()}")