[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29913 - in gnunet-planetlab/gplmt: . gplmt
From: |
gnunet |
Subject: |
[GNUnet-SVN] r29913 - in gnunet-planetlab/gplmt: . gplmt |
Date: |
Mon, 7 Oct 2013 01:18:53 +0200 |
Author: otarabai
Date: 2013-10-07 01:18:53 +0200 (Mon, 07 Oct 2013)
New Revision: 29913
Modified:
gnunet-planetlab/gplmt/gplmt.conf
gnunet-planetlab/gplmt/gplmt/Configuration.py
gnunet-planetlab/gplmt/gplmt/Worker.py
Log:
Added planetlab keyfile configuration
Modified: gnunet-planetlab/gplmt/gplmt/Configuration.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Configuration.py 2013-10-06 23:00:26 UTC
(rev 29912)
+++ gnunet-planetlab/gplmt/gplmt/Configuration.py 2013-10-06 23:18:53 UTC
(rev 29913)
@@ -50,6 +50,8 @@
self.pl_api_url = ""
self.pl_username = None
self.pl_password = None
+ self.pl_keyfile = None
+ self.pl_keyfile_password = None
self.ssh_username = ""
self.ssh_add_unkown_hostkeys = False
self.ssh_keyfile = None
@@ -105,6 +107,14 @@
self.pl_password = config.get("planetlab", "password")
except ConfigParser.NoOptionError as e:
pass
+ try:
+ self.pl_keyfile = os.path.expanduser(config.get("planetlab",
"pl_keyfile"))
+ except ConfigParser.NoOptionError as e:
+ pass
+ try:
+ self.pl_keyfile_password = config.get("planetlab",
"pl_keyfile_password")
+ except ConfigParser.NoOptionError as e:
+ pass
except ConfigParser.NoSectionError:
pass
Modified: gnunet-planetlab/gplmt/gplmt/Worker.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Worker.py 2013-10-06 23:00:26 UTC (rev
29912)
+++ gnunet-planetlab/gplmt/gplmt/Worker.py 2013-10-06 23:18:53 UTC (rev
29913)
@@ -538,19 +538,20 @@
self.ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
# check for private key existance
keyfile = None
- if (g_configuration.ssh_keyfile != None):
- if (os.path.exists (g_configuration.ssh_keyfile)):
- g_logger.log (self.node.hostname + " : Found " +
g_configuration.ssh_keyfile)
- keyfile = g_configuration.ssh_keyfile
+ if (g_configuration.pl_keyfile != None):
+ if (os.path.exists (g_configuration.pl_keyfile)):
+ g_logger.log (self.node.hostname + " : Found " +
g_configuration.pl_keyfile)
+ keyfile = g_configuration.pl_keyfile
else:
- g_logger.log (self.node.hostname + " : Not found " +
g_configuration.ssh_keyfile)
+ g_logger.log (self.node.hostname + " : Not found " +
g_configuration.pl_keyfile)
g_logger.log (self.node.hostname + " : Trying to connect to '"
+Util.print_ssh_connection (self.node) + "'")
g_logger.log (self.node.hostname + " : Using node information
username '" + g_configuration.pl_slicename + "'")
self.ssh.connect (self.node.hostname,
port=self.node.port or 22,
username=g_configuration.pl_slicename,
timeout=10,
- key_filename=keyfile)
+ key_filename=keyfile,
+ password=g_configuration.pl_keyfile_password)
self.transport = self.ssh.get_transport()
except (IOError,
paramiko.SSHException,
Modified: gnunet-planetlab/gplmt/gplmt.conf
===================================================================
--- gnunet-planetlab/gplmt/gplmt.conf 2013-10-06 23:00:26 UTC (rev 29912)
+++ gnunet-planetlab/gplmt/gplmt.conf 2013-10-06 23:18:53 UTC (rev 29913)
@@ -23,6 +23,10 @@
# Planetlab
#api_url = https://www.planet-lab.org/PLCAPI/
+# Authentication
+pl_keyfile = <keyfile>
+pl_keyfile_password = <password>
+
# Planetlab username
username = <pl_username>
# Planetlab password
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29913 - in gnunet-planetlab/gplmt: . gplmt,
gnunet <=