From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Wed, 28 Nov 2007 22:24:48 +0000 (+0000)
Subject: Added a fix for HPiLO that got lost some how.
X-Git-Tag: Monitor-1.0-0~24
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1d547d635cd0748e1790c73aafc4281261764f05;p=monitor.git

Added a fix for HPiLO that got lost some how.
---

diff --git a/reboot.py b/reboot.py
index fb30ace..49db556 100755
--- a/reboot.py
+++ b/reboot.py
@@ -1096,9 +1096,13 @@ def reboot_test(nodename, values, continue_probe, verbose, dryrun):
 
 		# iLO
 		elif continue_probe and values['model'].find("HP iLO") >= 0:
-			hpilo = HPiLO(values, verbose, ['22'])
-			rb_ret = hpilo.reboot(0, dryrun)
-			if rb_ret != 0:
+			try:
+				hpilo = HPiLO(values, verbose, ['22'])
+				rb_ret = hpilo.reboot(0, dryrun)
+				if rb_ret != 0:
+					hpilo = HPiLOHttps(values, verbose, ['443'])
+					rb_ret = hpilo.reboot(0, dryrun)
+			except:
 				hpilo = HPiLOHttps(values, verbose, ['443'])
 				rb_ret = hpilo.reboot(0, dryrun)