Merge lp:~jason-hobbs/maas/opensesspriv-workaround-required-lp-1287964 into lp:~maas-committers/maas/trunk

[Jason Hobbs]

Enable opensesspriv workaround for ipmipower.

Many BMCs require this workaround to be enabled for LAN 2.0 sessions to work. The change is fairly innocuous, stays within the bounds of the IPMI spec, and shouldn't cause any issues on BMCs that don't require it. The workaround was tested on a handful of systems that both require and it and don't require it.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

=== modified file 'etc/maas/templates/power/ipmi.template'
--- etc/maas/templates/power/ipmi.template	2014-02-26 07:05:31 +0000
+++ etc/maas/templates/power/ipmi.template	2014-03-06 19:18:34 +0000
@@ -19,6 +19,11 @@
 power_address={{ip_address}}
 {{endif}}
 
+# This workaround is required on many BMCs, and should have no impact
+# on BMCs that don't require it.
+# See https://bugs.launchpad.net/maas/+bug/1287964
+workarounds="-W opensesspriv"
+
 # Determines the power command needed to execute the desired
 # action. This function receives ${power_change} as argument.
 formulate_power_command() {
@@ -55,9 +60,9 @@
     fi
 
     echo workaround |\
-    ${ipmi_chassis_config} ${driver_option} -h ${power_address} -u ${power_user} -p ${power_pass} --commit --filename ${config}
+    ${ipmi_chassis_config} ${workarounds} ${driver_option} -h ${power_address} -u ${power_user} -p ${power_pass} --commit --filename ${config}
     echo workaround |\
-    ${ipmipower} ${driver_option} -h ${power_address} -u ${power_user} -p ${power_pass} "$@"
+    ${ipmipower} ${workarounds} ${driver_option} -h ${power_address} -u ${power_user} -p ${power_pass} "$@"
 }
 
 # This script deliberately does not check the current power state