X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=getsshkeys.py;h=68d29452d1a97bd95dabc0e31312a0e53edaeb75;hb=4d56ef5473c6486c321dd2797be45b45b0606dae;hp=95df2e697800a6c200e832857bbfd61268a3f002;hpb=4340c146173732c090d03d4496769fbc89bb986a;p=monitor.git

diff --git a/getsshkeys.py b/getsshkeys.py
index 95df2e6..68d2945 100755
--- a/getsshkeys.py
+++ b/getsshkeys.py
@@ -6,10 +6,10 @@ import string
 import time
 import xml, xmlrpclib
 try:
-	import monitorconfig
-	auth = {'Username'   : monitorconfig.API_AUTH_USER,
+	from monitor import config
+	auth = {'Username'   : config.API_AUTH_USER,
 	        'AuthMethod' : "password",
-			'AuthString' : monitorconfig.API_AUTH_PASSWORD}
+			'AuthString' : config.API_AUTH_PASSWORD}
 except:
 	import traceback
 	print traceback.print_exc()
@@ -17,7 +17,12 @@ except:
 
 args = {}
 args['known_hosts'] =  os.environ['HOME'] + os.sep + ".ssh" + os.sep + "known_hosts"
-args['XMLRPC_SERVER'] = 'https://boot.planet-lab.org/PLCAPI/'
+try:
+	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):