Merge pull request #5 from jabl/boot_py_log_error

Log boot.py exceptions

Merging it so that we can test it tomorrow. We'll do a complete test cluster re installation. thanks @jabl

Author: A1ve5

files/boot.py

@@ -3,15 +3,27 @@
 import os
 import socket
 import json
+import syslog
 sys.stderr = sys.stdout
 print "Content-Type: text/plain"
 print
 
+def pxe_abort():
+  """Abort the PXE boot, continue with the next boot device in the BIOS boot order"""
+  print "#!ipxe"
+  print "exit"
+  sys.exit(0)
+
 try:
   # from the name, e.g. c1-3 take c1-3
   hostname = socket.gethostbyaddr(os.environ["REMOTE_ADDR"])[0].split(".")[0]
 
-  os.remove("/var/www/provision/reinstall/" + hostname)
+  try:
+    os.remove("/var/www/provision/reinstall/" + hostname)
+  except OSError as e:
+    syslog.syslog(syslog.LOG_INFO, str(e))
+    pxe_abort()
+
   with open('/var/www/provision/nodes/pxe_nodes.json') as f:
     j = json.load(f)
   nodesettings = j[hostname]
@@ -25,6 +37,6 @@
   print "initrd http://" + nodesettings["kickstart_server_ip"] + "/ks/initrd.img"
   print "boot"
 
-except:
-   print "#!ipxe"
-   print "exit"
+except Exception as e:
+  syslog.syslog(syslog.LOG_ERR, str(e))
+  pxe_abort()