git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
svn merge -r 12308:13112 https://svn.planet-lab.org/svn/Monitor/branches/2.0/
[monitor.git]
/
getsshkeys.py
diff --git
a/getsshkeys.py
b/getsshkeys.py
index
137ea68
..
d362c94
100755
(executable)
--- a/
getsshkeys.py
+++ b/
getsshkeys.py
@@
-17,7
+17,12
@@
except:
args = {}
args['known_hosts'] = os.environ['HOME'] + os.sep + ".ssh" + os.sep + "known_hosts"
args = {}
args['known_hosts'] = os.environ['HOME'] + os.sep + ".ssh" + os.sep + "known_hosts"
-args['XMLRPC_SERVER'] = 'https://boot.planet-lab.org/PLCAPI/'
+try:
+ from monitor import config
+ args['XMLRPC_SERVER'] = config.API_SERVER
+except:
+ args['XMLRPC_SERVER'] = 'https://boot.planet-lab.org/PLCAPI/'
+ print "Using default API server %s" % args['XMLRPC_SERVER']
class SSHKnownHosts:
def __init__(self, args = args):
class SSHKnownHosts:
def __init__(self, args = args):