X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bootman.py;h=22201cb69db34b69f0e91e8c732df91ef32f87be;hb=4d56ef5473c6486c321dd2797be45b45b0606dae;hp=92f4ffe3b8655f6c27649244830951ca15e1fc8a;hpb=d428ca60fd1eb7283291b8f47cdd86dce4986925;p=monitor.git

diff --git a/bootman.py b/bootman.py
index 92f4ffe..22201cb 100755
--- a/bootman.py
+++ b/bootman.py
@@ -317,7 +317,8 @@ def reboot(hostname, config=None, forced_action=None):
 							mailtxt.newbootcd_one[1] % args, True, db='bootcd_persistmessages')
 
 		loginbase = plc.siteId(hostname)
-		m.send([const.PIEMAIL % loginbase, const.TECHEMAIL % loginbase])
+		emails = plc.getTechEmails(loginbase)
+		m.send(emails) 
 
 		print "\tDisabling %s due to out-of-date BOOTCD" % hostname
 		api.UpdateNode(hostname, {'boot_state' : 'disable'})
@@ -448,7 +449,8 @@ def reboot(hostname, config=None, forced_action=None):
 										 mailtxt.baddisk[1] % args, True, db='hardware_persistmessages')
 
 			loginbase = plc.siteId(hostname)
-			m.send([const.PIEMAIL % loginbase, const.TECHEMAIL % loginbase])
+			emails = plc.getTechEmails(loginbase)
+			m.send(emails) 
 			conn.set_nodestate('disable')
 			return False
 
@@ -613,6 +615,7 @@ def reboot(hostname, config=None, forced_action=None):
 			 "bminit-cfg-auth-implementerror-bootcheckfail-update-implementerror-bootupdatefail-done",
 			 "bminit-cfg-auth-getplc-update-installinit-validate-rebuildinitrd-netcfg-update3-implementerror-nospace-update-debug-done",
 			 "bminit-cfg-auth-getplc-hardware-installinit-installdisk-installbootfs-exception-downloadfail-update-debug-done",
+			 "bminit-cfg-auth-getplc-update-installinit-validate-implementerror-update-debug-done",
 			 ]:
 		sequences.update({n: "restart_node_boot"})
 
@@ -669,7 +672,7 @@ def reboot(hostname, config=None, forced_action=None):
 		m = PersistMessage(hostname, mailtxt.unknownsequence[0] % args,
 									 mailtxt.unknownsequence[1] % args, False, db='unknown_persistmessages')
 		m.reset()
-		m.send(['monitor-list@lists.planet-lab.org'])
+		m.send([config.cc_email]) 
 
 		conn.restart_bootmanager('boot')
 
@@ -707,7 +710,7 @@ def reboot(hostname, config=None, forced_action=None):
 			m = PersistMessage(hostname, "Suspicous error from BootManager on %s" % args,
 										 mailtxt.unknownsequence[1] % args, False, db='suspect_persistmessages')
 			m.reset()
-			m.send(['monitor-list@lists.planet-lab.org'])
+			m.send([config.cc_email]) 
 
 			conn.restart_bootmanager('boot')
 
@@ -718,7 +721,8 @@ def reboot(hostname, config=None, forced_action=None):
 			m = PersistMessage(hostname,  mailtxt.plnode_cfg[0] % args,  mailtxt.plnode_cfg[1] % args, 
 								True, db='nodeid_persistmessages')
 			loginbase = plc.siteId(hostname)
-			m.send([const.PIEMAIL % loginbase, const.TECHEMAIL % loginbase])
+			emails = plc.getTechEmails(loginbase)
+			m.send(emails) 
 			conn.dump_plconf_file()
 			conn.set_nodestate('disable')
 
@@ -730,7 +734,8 @@ def reboot(hostname, config=None, forced_action=None):
 			m = PersistMessage(hostname,  mailtxt.plnode_network[0] % args,  mailtxt.plnode_cfg[1] % args, 
 								True, db='nodenet_persistmessages')
 			loginbase = plc.siteId(hostname)
-			m.send([const.PIEMAIL % loginbase, const.TECHEMAIL % loginbase])
+			emails = plc.getTechEmails(loginbase)
+			m.send(emails) 
 			conn.dump_plconf_file()
 			conn.set_nodestate('disable')
 
@@ -745,7 +750,8 @@ def reboot(hostname, config=None, forced_action=None):
 								mailtxt.newalphacd_one[1] % args, True, db='bootcd_persistmessages')
 
 			loginbase = plc.siteId(hostname)
-			m.send([const.PIEMAIL % loginbase, const.TECHEMAIL % loginbase])
+			emails = plc.getTechEmails(loginbase)
+			m.send(emails) 
 
 			print "\tDisabling %s due to out-of-date BOOTCD" % hostname
 			conn.set_nodestate('disable')
@@ -763,7 +769,8 @@ def reboot(hostname, config=None, forced_action=None):
 										 mailtxt.baddisk[1] % args, True, db='hardware_persistmessages')
 
 			loginbase = plc.siteId(hostname)
-			m.send([const.PIEMAIL % loginbase, const.TECHEMAIL % loginbase])
+			emails = plc.getTechEmails(loginbase)
+			m.send(emails) 
 			conn.set_nodestate('disable')
 
 		elif sequences[s] == "update_hardware_email":
@@ -775,7 +782,8 @@ def reboot(hostname, config=None, forced_action=None):
 										 mailtxt.minimalhardware[1] % args, True, db='minhardware_persistmessages')
 
 			loginbase = plc.siteId(hostname)
-			m.send([const.PIEMAIL % loginbase, const.TECHEMAIL % loginbase])
+			emails = plc.getTechEmails(loginbase)
+			m.send(emails) 
 			conn.set_nodestate('disable')
 
 		elif sequences[s] == "bad_dns_email":
@@ -798,7 +806,8 @@ def reboot(hostname, config=None, forced_action=None):
 										 mailtxt.baddns[1] % args, True, db='baddns_persistmessages')
 
 			loginbase = plc.siteId(hostname)
-			m.send([const.PIEMAIL % loginbase, const.TECHEMAIL % loginbase])
+			emails = plc.getTechEmails(loginbase)
+			m.send(emails) 
 			conn.set_nodestate('disable')
 
 	if flag_set:
@@ -811,7 +820,7 @@ def reboot(hostname, config=None, forced_action=None):
 # MAIN -------------------------------------------------------------------
 
 def main():
-	import parser as parsermodule
+	from monitor import parser as parsermodule
 	parser = parsermodule.getParser()
 
 	parser.set_defaults(child=False, collect=False, nosetup=False, verbose=False,