X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bootman.py;fp=bootman.py;h=b9a161f5aeacf484590b2319d676d9b25d684f54;hb=c3f2afdc81c6711c3825c82e2cd4970671575438;hp=c3116bcc240d3476c7efff5c645aee19eb44f41e;hpb=4b1825d8577cfd0266d8c4ac2254a96407e06112;p=monitor.git

diff --git a/bootman.py b/bootman.py
index c3116bc..b9a161f 100755
--- a/bootman.py
+++ b/bootman.py
@@ -445,7 +445,7 @@ def reboot(hostname, config=None, forced_action=None):
 
 			loginbase = plc.siteId(hostname)
 			m.send([policy.PIEMAIL % loginbase, policy.TECHEMAIL % loginbase])
-			conn.set_nodestate('diag')
+			conn.set_nodestate('disable')
 			return False
 
 	print "...Downloading bm.log from %s" % node
@@ -701,7 +701,7 @@ def reboot(hostname, config=None, forced_action=None):
 			loginbase = plc.siteId(hostname)
 			m.send([policy.PIEMAIL % loginbase, policy.TECHEMAIL % loginbase])
 			conn.dump_plconf_file()
-			conn.set_nodestate('diag')
+			conn.set_nodestate('disable')
 
 		elif sequences[s] == "nodenetwork_email":
 			print "...Sending message to LOOK AT NODE NETWORK"
@@ -713,7 +713,7 @@ def reboot(hostname, config=None, forced_action=None):
 			loginbase = plc.siteId(hostname)
 			m.send([policy.PIEMAIL % loginbase, policy.TECHEMAIL % loginbase])
 			conn.dump_plconf_file()
-			conn.set_nodestate('diag')
+			conn.set_nodestate('disable')
 
 		elif sequences[s] == "update_bootcd_email":
 			print "...NOTIFY OWNER TO UPDATE BOOTCD!!!"
@@ -792,10 +792,11 @@ def reboot(hostname, config=None, forced_action=None):
 # MAIN -------------------------------------------------------------------
 
 def main():
-	from config import config
-	from optparse import OptionParser
-	parser = OptionParser()
-	parser.set_defaults(node=None, nodelist=None, child=False, collect=False, nosetup=False, verbose=False, force=None, quiet=False)
+	import parser as parsermodule
+	parser = parsermodule.getParser()
+
+	parser.set_defaults(child=False, collect=False, nosetup=False, verbose=False, 
+						force=None, quiet=False)
 	parser.add_option("", "--child", dest="child", action="store_true", 
 						help="This is the child mode of this process.")
 	parser.add_option("", "--force", dest="force", metavar="boot_state",
@@ -810,12 +811,9 @@ def main():
 						help="No action, just collect dmesg, and bm.log")
 	parser.add_option("", "--nosetup", dest="nosetup", action="store_true", 
 						help="Do not perform the orginary setup phase.")
-	parser.add_option("", "--node", dest="node", metavar="nodename.edu", 
-						help="A single node name to try to bring out of debug mode.")
-	parser.add_option("", "--nodelist", dest="nodelist", metavar="nodelist.txt", 
-						help="A list of nodes to bring out of debug mode.")
-	config = config(parser)
-	config.parse_args()
+
+	parser = parsermodule.getParser(['nodesets', 'defaults'], parser)
+	config = parsermodule.parse_args(parser)
 
 	if config.nodelist:
 		nodes = config.getListFromFile(config.nodelist)