aboutsummaryrefslogtreecommitdiff
path: root/rumba/model.py
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@ugent.be>2017-10-24 18:08:44 +0200
committerSander Vrijders <sander.vrijders@ugent.be>2017-10-24 18:08:44 +0200
commitd91a601494ba14172b6c239aa6c28e6256c62ca7 (patch)
tree2d14bc314dc10ea4e0b865305187357f0e0fefd4 /rumba/model.py
parentc09a71b756ab3208ac02a006f9a4d54792b803b5 (diff)
downloadrumba-d91a601494ba14172b6c239aa6c28e6256c62ca7.tar.gz
rumba-d91a601494ba14172b6c239aa6c28e6256c62ca7.zip
ssh_support: Use native Paramiko API for Proxy
This uses the native paramiko API for proxycommands instead of invoking OpenSSH on the host after connecting to it since that gives race conditons with Paramiko.
Diffstat (limited to 'rumba/model.py')
-rw-r--r--rumba/model.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/rumba/model.py b/rumba/model.py
index 62125a6..7d7e214 100644
--- a/rumba/model.py
+++ b/rumba/model.py
@@ -192,12 +192,12 @@ class NormalDIF(DIF):
# SSH Configuration
#
class SSHConfig:
- def __init__(self, hostname, port=22, proxy_command=None):
+ def __init__(self, hostname, port=22, proxy_server=None):
self.username = None
self.password = None
self.hostname = hostname
self.port = port
- self.proxy_command = proxy_command
+ self.proxy_server = proxy_server
def set_username(self, username):
self.username = username
@@ -778,7 +778,7 @@ class Experiment:
self.testbed.username,
node.ssh_config.hostname,
node.ssh_config.port,
- node.ssh_config.proxy_command))
+ node.ssh_config.proxy_server))
f.close()
# Examine the nodes and DIFs, compute the registration and enrollment