diff options
| author | Dimitri Staessens <dimitri@ouroboros.rocks> | 2021-07-09 19:06:28 +0200 |
|---|---|---|
| committer | Dimitri Staessens <dimitri@ouroboros.rocks> | 2021-07-09 19:09:59 +0200 |
| commit | c069a24e2587bf7be8ebbb418c7e987dd8dc4930 (patch) | |
| tree | aaf1100b74e45957e2ae048744e30854ea780f5e /rumba/ssh_support.py | |
| parent | 5a5f1efdbe985bc5a6312217ef531a68f6a85fa7 (diff) | |
| download | rumba-c069a24e2587bf7be8ebbb418c7e987dd8dc4930.tar.gz rumba-c069a24e2587bf7be8ebbb418c7e987dd8dc4930.zip | |
testbeds: Fix jfed support for recent CLI
This updates jfed support for some recent changes in the CLI. Since
the new CLI requires writing the jfed password to a text file, I added
an option to set it in the experiment description too. It will still
prompt if not set. There is also an option to enable/disable the
bastion server, as there has been some changes to its login.
Diffstat (limited to 'rumba/ssh_support.py')
| -rw-r--r-- | rumba/ssh_support.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/rumba/ssh_support.py b/rumba/ssh_support.py index 7b3a163..e23a18e 100644 --- a/rumba/ssh_support.py +++ b/rumba/ssh_support.py @@ -89,6 +89,10 @@ def ssh_connect(hostname, port, username, password, time_out, proxy_server): try: proxy_client = None if proxy_server is not None: + logger.debug('Using proxy server %s' % proxy_server) + # bastion changed to this username policy + if 'bastion' in proxy_server: + username = 'fff' + username proxy_client = get_ssh_client() # Assume port 22 for the proxy server for now proxy_client.connect(proxy_server, 22, username, password, @@ -402,9 +406,9 @@ def aptitude_install(testbed, node, packages): return s else: def sudo(s): - return 'sudo ' + s + return 'sudo' + s - package_install = "apt-get install " + package_install = " DEBIAN_FRONTEND=noninteractive apt-get install " for package in packages: package_install += package + " " package_install += "--yes" |