[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r27041 - gnunet-planetlab/gplmt/gplmt
From: |
gnunet |
Subject: |
[GNUnet-SVN] r27041 - gnunet-planetlab/gplmt/gplmt |
Date: |
Mon, 6 May 2013 16:37:01 +0200 |
Author: wachs
Date: 2013-05-06 16:37:01 +0200 (Mon, 06 May 2013)
New Revision: 27041
Modified:
gnunet-planetlab/gplmt/gplmt/Worker.py
Log:
improved ssh login
Modified: gnunet-planetlab/gplmt/gplmt/Worker.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Worker.py 2013-05-06 14:36:21 UTC (rev
27040)
+++ gnunet-planetlab/gplmt/gplmt/Worker.py 2013-05-06 14:37:01 UTC (rev
27041)
@@ -292,15 +292,25 @@
else:
g_logger.log (self.node + " : Not found " +
g_configuration.ssh_keyfile)
- g_logger.log (self.node + " : Trying to connect to " +
- g_configuration.pl_slicename + "@" + self.node +
+ if ("" != g_configuration.ssh_username):
+ g_logger.log (self.node + " : Trying to connect to " +
+ g_configuration.ssh_username + "@" + self.node +
" using password '" + g_configuration.ssh_password+
"' and private keyfile '" +str(keyfile)+ "'")
- ssh.connect (self.node,
- username=g_configuration.pl_slicename,
+ ssh.connect (self.node,
+ username=g_configuration.ssh_username,
password=g_configuration.ssh_password,
timeout=10,
key_filename=keyfile)
+ else:
+ g_logger.log (self.node + " : Trying to connect to " +
+ self.node +
+ " using password '" + g_configuration.ssh_password+
+ "' and private keyfile '" +str(keyfile)+ "'")
+ ssh.connect (self.node,
+ password=g_configuration.ssh_password,
+ timeout=10,
+ key_filename=keyfile)
except (IOError,
paramiko.SSHException,
paramiko.BadHostKeyException,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r27041 - gnunet-planetlab/gplmt/gplmt,
gnunet <=