git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove dependency on the deprecated module, 'monitorconfig.py'
[monitor.git]
/
bootman.py
diff --git
a/bootman.py
b/bootman.py
index
faf77a2
..
ff2a6d5
100755
(executable)
--- a/
bootman.py
+++ b/
bootman.py
@@
-24,7
+24,7
@@
from unified_model import *
from emailTxt import mailtxt
from nodeconfig import network_config_to_str
import traceback
from emailTxt import mailtxt
from nodeconfig import network_config_to_str
import traceback
-import
monitor
config
+import config
import signal
class Sopen(subprocess.Popen):
import signal
class Sopen(subprocess.Popen):
@@
-207,7
+207,7
@@
class PlanetLabSession:
args['port'] = self.port
args['user'] = 'root'
args['hostname'] = self.node
args['port'] = self.port
args['user'] = 'root'
args['hostname'] = self.node
- args['monitordir'] =
monitor
config.MONITOR_SCRIPT_ROOT
+ args['monitordir'] = config.MONITOR_SCRIPT_ROOT
ssh_port = 22
if self.nosetup:
ssh_port = 22
if self.nosetup: