Merge lp:~julian-edwards/maas/ipmi-password-failure-detect into lp:~maas-committers/maas/trunk

[Julian Edwards]

Detect IPMI password failures and exit with the right status in the IPMI template.

I've tested this locally and it works, although there's a separate bug of the stderr from the template not reaching the event log, which I'll investigate separately.

[Raphaël Badin (rvb)]

review: Approve

=== modified file 'etc/maas/templates/power/ipmi.template'
--- etc/maas/templates/power/ipmi.template	2014-08-19 22:22:31 +0000
+++ etc/maas/templates/power/ipmi.template	2014-09-12 09:45:57 +0000
@@ -62,8 +62,17 @@
         echo workaround |\
         ${ipmi_chassis_config} ${workarounds} ${driver_option} -h ${power_address} -u ${power_user} -p ${power_pass} --commit --filename ${config}
     fi
+
+    # Use C locale to force English error messages.
     result=$(echo workaround |\
-    ${ipmipower} ${workarounds} ${driver_option} -h ${power_address} -u ${power_user} -p ${power_pass} "$@")
+    LC_ALL=C ${ipmipower} ${workarounds} ${driver_option} -h ${power_address} -u ${power_user} -p ${power_pass} "$@")
+
+    if [ $(echo $result | grep -q "password invalid") ]
+    then
+        echo "Invalid password" >&2
+        exit 1
+    fi
+
     case "$result" in
         *:* )
                 # Result looks like the usual IPMI output: