X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fsfagids.py;h=21ea58180c4429485b8a7b7ba24b5d7df9ae1832;hb=ecee05390277f57b02d21ffca0195292bde1defa;hp=88e234184a55aeaa64e525069de5747857461725;hpb=f7531602807435ff93f494677637c636616cd314;p=nodemanager.git diff --git a/plugins/sfagids.py b/plugins/sfagids.py index 88e2341..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 @@ -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