git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more heuristics for locating cgroups
[nodemanager.git]
/
nodemanager.py
diff --git
a/nodemanager.py
b/nodemanager.py
old mode 100644
(file)
new mode 100755
(executable)
index
e998a04
..
57c96c7
--- 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)
# 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
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):
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()
try:
if self.options.daemon: tools.daemon()