aboutsummaryrefslogtreecommitdiff
path: root/rumba
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2017-04-12 11:02:18 +0000
committerSander Vrijders <sander.vrijders@intec.ugent.be>2017-04-12 11:02:18 +0000
commit6d8d0d30d75b318650034470b376a57a37b57944 (patch)
tree8cc5baaa13366b3aa7bca376e5b0b79e6b65730a /rumba
parent27515c90d65f608969dee8c4b32df6a44e45c41b (diff)
parent443ed561660bd5f37d85042da841b2472b97f129 (diff)
downloadrumba-6d8d0d30d75b318650034470b376a57a37b57944.tar.gz
rumba-6d8d0d30d75b318650034470b376a57a37b57944.zip
Merge branch 'vincenzo' into 'master'
ssh_support: use ssh_config in copy_file_to_testbed See merge request !26
Diffstat (limited to 'rumba')
-rw-r--r--rumba/ssh_support.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rumba/ssh_support.py b/rumba/ssh_support.py
index 137c58b..ad32d13 100644
--- a/rumba/ssh_support.py
+++ b/rumba/ssh_support.py
@@ -108,7 +108,7 @@ def copy_file_to_testbed(testbed, ssh_config, text, file_name):
ssh_client = get_ssh_client()
try:
- ssh_client.connect(hostname, 22,
+ ssh_client.connect(ssh_config.hostname, ssh_config.port,
testbed.username,
testbed.password,
look_for_keys=True)