expose .ssh in homedir only for omf-friendly slices

[nodemanager.git] / plugins / sfagids.py

diff --git a/plugins/sfagids.py b/plugins/sfagids.py
index 81c7b1e..2723a7a 100644 (file)
--- a/plugins/sfagids.py
+++ b/plugins/sfagids.py
@@ -15,7 +15,7 @@ import traceback
 import tempfile
 try:
     from sfa.util.namespace import *
 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
     import sfa.util.xmlrpcprotocol as xmlrpcprotocol
     from sfa.trust.certificate import Keypair, Certificate
     from sfa.trust.credential import Credential


@@ -30,11 +30,11 @@ def start():
     logger.log("sfagid: plugin starting up ...")
     if not sfa:
         return
     logger.log("sfagid: plugin starting up ...")
     if not sfa:
         return

-    keyfile, certfile = get_keypair(None)
-    api = ComponentAPI(key_file=keyfile, cert_file=certfile)

     try:
     try:

+        keyfile, certfile = get_keypair(None)
+        api = ComponentAPI(key_file=keyfile, cert_file=certfile)

         api.get_node_key()
         api.get_node_key()

-    except AttributeError:
+    except:

         return
 
 def GetSlivers(data, config=None, plc=None):
         return
 
 def GetSlivers(data, config=None, plc=None):


@@ -128,7 +128,7 @@ def install_trusted_certs(api):
 
 def get_keypair(config = None):
     if not config:
 
 def get_keypair(config = None):
     if not config:

-        config = Config()
+        config = SfaConfig()

     hierarchy = Hierarchy()
     key_dir= hierarchy.basedir
     data_dir = config.data_path
     hierarchy = Hierarchy()
     key_dir= hierarchy.basedir
     data_dir = config.data_path