X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodemanager.py;h=57c96c7d95f6b2a3feaedb27c65244f0bb5d9e76;hb=refs%2Ftags%2Fnodemanager-5.2-7;hp=e998a0488a02263e15c19922315f4cb94a79380f;hpb=4f3d888493b5a8f195c73ca2eb3fbec98b4c86de;p=nodemanager.git diff --git a/nodemanager.py b/nodemanager.py index e998a04..57c96c7 100755 --- a/nodemanager.py +++ b/nodemanager.py @@ -74,7 +74,10 @@ class NodeManager: # Deal with plugins directory if os.path.exists(self.options.path): sys.path.append(self.options.path) - plugins = [ os.path.split(os.path.splitext(x)[0])[1] for x in glob.glob( os.path.join(self.options.path,'*.py') ) ] + plugins = [ os.path.split(os.path.splitext(x)[0])[1] + for x in glob.glob( os.path.join(self.options.path,'*.py') ) + if not x.endswith("/__init__.py") + ] self.modules += plugins if self.options.user_module: assert self.options.user_module in self.modules @@ -171,6 +174,9 @@ class NodeManager: return {} def run(self): + # make sure to create /etc/planetlab/virt so others can read that + # used e.g. in vsys-scripts's sliceip + tools.get_node_virt() try: if self.options.daemon: tools.daemon()