aboutsummaryrefslogtreecommitdiff
path: root/rumba/ssh_support.py
diff options
context:
space:
mode:
Diffstat (limited to 'rumba/ssh_support.py')
-rw-r--r--rumba/ssh_support.py8
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"