diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2017-07-28 10:07:31 +0000 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2017-07-28 10:07:31 +0000 |
| commit | f3f51c550ef9751bada8ffcd4d4e846c786a26e0 (patch) | |
| tree | b6cddc451fc182e0bd3384805f4ae705375f043b /rumba/testbeds/jfed.py | |
| parent | 7b43f02b415968371f1b5719232bd7741cb7f12f (diff) | |
| parent | 7dc3b5086d4c1d19c9ef315369f3fd7c4dd2889e (diff) | |
| download | rumba-f3f51c550ef9751bada8ffcd4d4e846c786a26e0.tar.gz rumba-f3f51c550ef9751bada8ffcd4d4e846c786a26e0.zip | |
Merge branch 'storyboard-impl' into 'master'
Storyboard impl
See merge request !61
Diffstat (limited to 'rumba/testbeds/jfed.py')
| -rw-r--r-- | rumba/testbeds/jfed.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/rumba/testbeds/jfed.py b/rumba/testbeds/jfed.py index 9c72ca7..8867dc6 100644 --- a/rumba/testbeds/jfed.py +++ b/rumba/testbeds/jfed.py @@ -155,11 +155,13 @@ class Testbed(mod.Testbed): node.ssh_config.hostname = \ node.name + "." + self.exp_name + "." + \ auth_name_r + "." + self.auth_name - node.ssh_config.proxycommand = "ssh -i '" + self.cert_file + \ - "' -o StrictHostKeyChecking=no " + \ - self.username + \ - "@bastion.test.iminds.be nc " + \ - node.ssh_config.hostname + " 22" + node.ssh_config.proxy_command = "ssh -i '" + self.cert_file + \ + "' -o StrictHostKeyChecking=no " + \ + self.username + \ + "@bastion.test.iminds.be nc " + \ + node.ssh_config.hostname + " 22" + node.ssh_config.username = self.username + node.ssh_config.password = self.password subprocess.call(["java", "-jar", self.jfed_jar, "create", "-S", self.proj_name, "--rspec", @@ -174,8 +176,6 @@ class Testbed(mod.Testbed): rspec = xml.parse(self.manifest) xml_nodes = rspec.getElementsByTagName("node") - dir_path = os.path.dirname(os.path.abspath(__file__)) - # Complete details of the nodes after swapin logger.info("Sleeping for two seconds to avoid contacting jfed nodes " "too soon.") |