X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fsfagids.py;h=21ea58180c4429485b8a7b7ba24b5d7df9ae1832;hb=854fdfe526baa82adf31f14cac8a62223b310050;hp=81c7b1e1eb97cb969730ffc77111978de1a9b3ac;hpb=7ae55ee113468d66caa497f6466a229ce3f84dc5;p=nodemanager.git

diff --git a/plugins/sfagids.py b/plugins/sfagids.py
index 81c7b1e..21ea581 100644
--- a/plugins/sfagids.py
+++ b/plugins/sfagids.py
@@ -1,9 +1,6 @@
 #!/usr/bin/python -tt
 # vim:set ts=4 sw=4 expandtab:
 #
-# $Id$
-# $URL$
-#
 # NodeManager plugin for installing SFA GID's in slivers
 # 
 
@@ -15,7 +12,7 @@ import traceback
 import tempfile
 try:
     from sfa.util.namespace import *
-    from sfa.util.config import Config
+    from sfa.util.config import Config as SfaConfig
     import sfa.util.xmlrpcprotocol as xmlrpcprotocol
     from sfa.trust.certificate import Keypair, Certificate
     from sfa.trust.credential import Credential
@@ -30,11 +27,11 @@ def start():
     logger.log("sfagid: plugin starting up ...")
     if not sfa:
         return
-    keyfile, certfile = get_keypair(None)
-    api = ComponentAPI(key_file=keyfile, cert_file=certfile)
     try:
+        keyfile, certfile = get_keypair(None)
+        api = ComponentAPI(key_file=keyfile, cert_file=certfile)
         api.get_node_key()
-    except AttributeError:
+    except:
         return
 
 def GetSlivers(data, config=None, plc=None):
@@ -128,7 +125,7 @@ def install_trusted_certs(api):
 
 def get_keypair(config = None):
     if not config:
-        config = Config()
+        config = SfaConfig()
     hierarchy = Hierarchy()
     key_dir= hierarchy.basedir
     data_dir = config.data_path