From: Alfredo Deza Date: Wed, 12 Dec 2018 19:30:08 +0000 (-0500) Subject: connection allow custom ssh_options X-Git-Tag: 0.0.34~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3e33494409ff754d1bba467d32dae68523e06ede;p=remoto.git connection allow custom ssh_options Signed-off-by: Alfredo Deza --- diff --git a/remoto/connection.py b/remoto/connection.py index ed5a7ef..07d0449 100644 --- a/remoto/connection.py +++ b/remoto/connection.py @@ -10,9 +10,10 @@ import execnet class Connection(object): def __init__(self, hostname, logger=None, sudo=False, threads=1, eager=True, - detect_sudo=False, interpreter=None): + detect_sudo=False, interpreter=None, ssh_options=None): self.sudo = sudo self.hostname = hostname + self.ssh_options = ssh_options self.logger = logger or FakeRemoteLogger() self.remote_module = None self.channel = None @@ -74,7 +75,11 @@ class Connection(object): elif self.sudo: interpreter = 'sudo ' + interpreter if _needs_ssh(hostname): - return 'ssh=%s//python=%s' % (hostname, interpreter) + if self.ssh_options: + return 'ssh=%s %s//python=%s' % ( + self.ssh_options, hostname, interpreter) + else: + return 'ssh=%s//python=%s' % (hostname, interpreter) return 'popen//python=%s' % interpreter def __enter__(self):