Merge lp:~rvb/maas/report-fatal-power-failures into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Fix the IPMI template so that an "invalid password" error results in the script exiting with a status code of 2 (indicative of a fatal failure).

I've tested that the script still works if the password is right and that this results in a meaningful event to be sent to the error log if not.

[Gavin Panella (allenap)]

Shell is so depressing.

review: Approve

[Gavin Panella (allenap)]

IPMI too.

[Raphaël Badin (rvb)]

> Shell is so depressing.

Very true. You might take solace in the fact that this code is going away… eventually :).

Thanks for the review!

=== modified file 'etc/maas/templates/power/ipmi.template'
--- etc/maas/templates/power/ipmi.template	2014-09-12 09:45:27 +0000
+++ etc/maas/templates/power/ipmi.template	2014-09-12 15:43:50 +0000
@@ -59,18 +59,26 @@
 
     if [ "$power_change" != "query" ]
     then
-        echo workaround |\
-        ${ipmi_chassis_config} ${workarounds} ${driver_option} -h ${power_address} -u ${power_user} -p ${power_pass} --commit --filename ${config}
+        # Use C locale to force English error messages.
+        result=$(echo workaround |\
+        LC_ALL=C ${ipmi_chassis_config} ${workarounds} ${driver_option} -h ${power_address} -u ${power_user} -p ${power_pass} --commit --filename ${config} 2>&
+1)
+
+        if echo $result | grep -q "password invalid"
+        then
+            echo "Invalid password" >&2
+            exit 2
+        fi
     fi
 
     # Use C locale to force English error messages.
     result=$(echo workaround |\
     LC_ALL=C ${ipmipower} ${workarounds} ${driver_option} -h ${power_address} -u ${power_user} -p ${power_pass} "$@")
 
-    if [ $(echo $result | grep -q "password invalid") ]
+    if echo $result | grep -q "password invalid"
     then
         echo "Invalid password" >&2
-        exit 1
+        exit 2
     fi
 
     case "$result" in