X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fbootman.py;h=2afbbf6347823434bf7e4782e5db18f7b694caef;hb=c981221e1aa839c3ba3e2fd11d89abf830a2fc38;hp=531f883e6adad05612e458f1235a7f5395643662;hpb=5772ce036b96297a23f834ea34ce4466ef4d522c;p=monitor.git

diff --git a/monitor/bootman.py b/monitor/bootman.py
index 531f883..2afbbf6 100755
--- a/monitor/bootman.py
+++ b/monitor/bootman.py
@@ -430,11 +430,16 @@ class DebugInterface:
 				"bminit-cfg-auth-getplc-update-installinit-validate-rebuildinitrd-netcfg-disk-update4-update3-update3-implementerror-update-debug-done",
 				"bminit-cfg-auth-getplc-installinit-validate-exception-bmexceptmount-exception-noinstall-update-debug-done",
 				"bminit-cfg-auth-getplc-update-installinit-validate-exception-bmexceptmount-exception-noinstall-update-debug-done",
+				"bminit-cfg-auth-getplc-update-installinit-validate-bmexceptvgscan-exception-noinstall-update-debug-validate-bmexceptvgscan-done",
+				"bminit-cfg-auth-getplc-update-installinit-validate-exception-noinstall-update-debug-validate-done",
 				]:
 			sequences.update({n : "restart_bootmanager_rins"})
 
 		# repair_node_keys
-		sequences.update({"bminit-cfg-auth-bootcheckfail-authfail-exception-update-bootupdatefail-authfail-debug-done": "repair_node_keys"})
+		for n in ["bminit-cfg-auth-bootcheckfail-authfail-exception-update-bootupdatefail-authfail-debug-validate-exception-done",
+					"bminit-cfg-auth-bootcheckfail-authfail-exception-update-bootupdatefail-authfail-debug-done",
+				]:
+			sequences.update({n: "repair_node_keys"})
 
 		#   conn.restart_node('reinstall')
 		for n in ["bminit-cfg-auth-getplc-update-installinit-validate-rebuildinitrd-exception-chrootfail-update-debug-done",
@@ -459,12 +464,14 @@ class DebugInterface:
 				 "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",
+				 "bminit-cfg-auth-getplc-exception-update-bootupdatefail-debug-done",
 				 ]:
 			sequences.update({n: "restart_node_boot"})
 
 		# update_node_config_email
 		for n in ["bminit-cfg-exception-nocfg-update-bootupdatefail-nonode-debug-done",
 				  "bminit-cfg-exception-update-bootupdatefail-nonode-debug-done",
+				  "bminit-cfg-exception-update-bootupdatefail-nonode-debug-validate-exception-done",
 				  "bminit-cfg-auth-bootcheckfail-nonode-exception-update-bootupdatefail-nonode-debug-done",
 				]:
 			sequences.update({n : "update_node_config_email"})
@@ -636,7 +643,7 @@ def restore(sitehist, hostname, config=None, forced_action=None):
 			sitehist.sendMessage('newbootcd_notice', hostname=hostname)
 
 			print "\tDisabling %s due to out-of-date BootImage" % hostname
-			api.UpdateNode(hostname, {'boot_state' : 'disable'})
+			api.UpdateNode(hostname, {'boot_state' : 'disabled'})
 
 		# NOTE: nothing else is possible.
 		return True
@@ -686,7 +693,7 @@ def restore(sitehist, hostname, config=None, forced_action=None):
 
 				log=conn.get_dmesg().read()
 				sitehist.sendMessage('baddisk_notice', hostname=hostname, log=log)
-				conn.set_nodestate('disable')
+				conn.set_nodestate('disabled')
 
 			return False
 
@@ -748,7 +755,8 @@ def restore(sitehist, hostname, config=None, forced_action=None):
 			if conn.compare_and_repair_nodekeys():
 				# the keys either are in sync or were forced in sync.
 				# so try to reboot the node again.
-				conn.restart_bootmanager('reinstall')
+				# TODO: why was this originally 'reinstall' instead of 'boot'??
+				conn.restart_bootmanager('boot')
 				pass
 			else:
 				# there was some failure to synchronize the keys.
@@ -805,7 +813,7 @@ def restore(sitehist, hostname, config=None, forced_action=None):
 				args['log'] = conn.get_dmesg().read()
 
 				sitehist.sendMessage('baddisk_notice', **args)
-				conn.set_nodestate('disable')
+				conn.set_nodestate('disabled')
 
 		elif sequences[s] == "update_hardware_email":
 			if not found_within(recent_actions, 'minimalhardware_notice', 1):