update basic documentation files.

[monitor.git] / getsshkeys.py

diff --git a/getsshkeys.py b/getsshkeys.py
index 137ea68..fb4c2a7 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['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):
@@ -150,7 +155,7 @@ class SSHKnownHosts:
                nodenetworks = node['nodenetwork_ids']
                if len(nodenetworks)==0: return (host, None, None, None)
 
-               # the [0] subscript to node['nodenetwork_ids'] means
+               # the [0] subscript to node['interface_ids'] means
                # that this function wont work with multihomed nodes
                l_nw = self.nodenetworks.get(nodenetworks[0],None)
                if l_nw is None: return (host, None, None, None)