diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2017-04-28 11:38:42 +0000 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2017-04-28 11:38:42 +0000 |
| commit | 2e17296fb9db66b9832655137b1942fcc0c2b2a7 (patch) | |
| tree | 8858172b52793a3fdfce0a46f864cefb28683ae8 /rumba | |
| parent | dac375cda283ed0efe3a151022f45f5e723273db (diff) | |
| parent | da965f80da37c2b775e1e62e469589a3be05da30 (diff) | |
| download | rumba-2e17296fb9db66b9832655137b1942fcc0c2b2a7.tar.gz rumba-2e17296fb9db66b9832655137b1942fcc0c2b2a7.zip | |
Merge branch 'jfed-irati-fixes' into 'master'
Small fixes for jfed-irati compatibility
See merge request !43
Diffstat (limited to 'rumba')
| -rw-r--r-- | rumba/ssh_support.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/rumba/ssh_support.py b/rumba/ssh_support.py index 26d64fb..cb36910 100644 --- a/rumba/ssh_support.py +++ b/rumba/ssh_support.py @@ -160,6 +160,11 @@ def copy_paths_to_testbed(testbed, ssh_config, paths, destination): """ ssh_client = get_ssh_client() + if ssh_config.proxycommand is not None: + proxy = paramiko.ProxyCommand(ssh_config.proxycommand) + else: + proxy = None + if destination is not '' and not destination.endswith('/'): destination = destination + '/' @@ -167,7 +172,8 @@ def copy_paths_to_testbed(testbed, ssh_config, paths, destination): ssh_client.connect(ssh_config.hostname, ssh_config.port, testbed.username, testbed.password, - look_for_keys=True) + look_for_keys=True, + sock=proxy) sftp_client = ssh_client.open_sftp() |