X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodequery.py;h=61513f4a623ffb97e7546f50c65c60a40e2a093e;hb=a21f1f49c94a666768d3bce90659d4fcb0c7b180;hp=c78d6b4bbb65dc9f9a6a53490abe0a89e4ed3f59;hpb=125c27b9121122663bada7e36eb2a00c95362d18;p=monitor.git

diff --git a/nodequery.py b/nodequery.py
index c78d6b4..61513f4 100755
--- a/nodequery.py
+++ b/nodequery.py
@@ -36,6 +36,10 @@ def fb_print_nodeinfo(fbnode, hostname, fields=None):
 		fbnode['bootcd_version'] = fbnode['bootcd_version'].split()[-1]
 	else:
 		fbnode['bootcd_version'] = "unknown"
+        if not fbnode['boot_server']:
+                fbnode['boot_server'] = "unknown"
+        if not fbnode['install_date']:
+                fbnode['install_date'] = "unknown"
 	fbnode['pcu'] = color_pcu_state(fbnode)
 
 	if not fields:
@@ -58,7 +62,7 @@ def fb_print_nodeinfo(fbnode, hostname, fields=None):
 			#print "ERROR!!!!!!!!!!!!!!!!!!!!!"
 			pass
 
-		print "%(hostname)-45s | %(date_checked)11.11s | %(boot_state)5.5s| %(observed_status)8.8s | %(ssh_status)5.5s | %(pcu)6.6s | %(bootcd_version)6.6s | %(kernel_version)s" % fbnode
+		print "%(hostname)-45s | %(date_checked)11.11s | %(boot_state)5.5s| %(observed_status)8.8s | %(ssh_status)5.5s | %(pcu)6.6s | %(bootcd_version)6.6s | %(boot_server)s | %(install_date)s | %(kernel_version)s" % fbnode
 	else:
 		format = ""
 		for f in fields: