X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bootman.py;h=981a9118bf4485037e745e595a88ec8623ca709c;hb=da913fbd1629fc4669b186915df8ff3a340482d3;hp=0e13517d64ebd738b76742c031e826116179747e;hpb=6f2351e4b44590221425fa9b4bfa77c92db49b6a;p=monitor.git

diff --git a/bootman.py b/bootman.py
index 0e13517..981a911 100755
--- a/bootman.py
+++ b/bootman.py
@@ -20,7 +20,7 @@ from sets import Set
 import ssh.pxssh as pxssh
 import ssh.fdpexpect as fdpexpect
 import ssh.pexpect as pexpect
-from unified_model import *
+from monitor.model import *
 from emailTxt import mailtxt
 from nodeconfig import network_config_to_str
 import traceback
@@ -36,13 +36,6 @@ from Rpyc import SocketConnection, Async
 from Rpyc.Utils import *
 fb = None
 
-def get_fbnode(node):
-	global fb
-	if fb is None:
-		fb = database.dbLoad("findbad")
-	fbnode = fb['nodes'][node]['values']
-	return fbnode
-
 class NodeConnection:
 	def __init__(self, connection, node, config):
 		self.node = node
@@ -314,7 +307,7 @@ def reboot(hostname, config=None, forced_action=None):
 
 	# NOTE: Nothing works if the bootcd is REALLY old.
 	#       So, this is the first step.
-	fbnode = get_fbnode(hostname)
+	fbnode = FindbadNodeRecord.get_latest_by(hostname=hostname).to_dict()
 	if fbnode['category'] == "OLDBOOTCD":
 		print "...NOTIFY OWNER TO UPDATE BOOTCD!!!"
 		args = {}
@@ -589,6 +582,9 @@ def reboot(hostname, config=None, forced_action=None):
 			"bminit-cfg-auth-getplc-update-hardware-installinit-installdisk-installbootfs-installcfg-installstop-update-installinit-validate-rebuildinitrd-netcfg-disk-update4-update3-update3-kernelcopyfail-exception-update-debug-done",
 			"bminit-cfg-auth-getplc-hardware-installinit-installdisk-installbootfs-installcfg-installstop-update-installinit-validate-rebuildinitrd-netcfg-disk-update4-update3-update3-kernelcopyfail-exception-update-debug-done",
 			"bminit-cfg-auth-getplc-installinit-validate-exception-noinstall-update-debug-done",
+			# actual solution appears to involve removing the bad files, and
+			# continually trying to boot the node.
+			"bminit-cfg-auth-getplc-update-installinit-validate-rebuildinitrd-netcfg-disk-update4-update3-update3-implementerror-update-debug-done",
 			]:
 		sequences.update({n : "restart_bootmanager_rins"})