Merge lp:~andreserl/maas/maas_ipmi_lan2.0 into lp:maas/trunk

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 1416
Merged at revision: 1416
Proposed branch: lp:~andreserl/maas/maas_ipmi_lan2.0
Merge into: lp:maas/trunk
Diff against target: 13 lines (+2/-2)
1 file modified
src/provisioningserver/power/templates/ipmi.template (+2/-2)
To merge this branch: bzr merge lp:~andreserl/maas/maas_ipmi_lan2.0
Reviewer Review Type Date Requested Status
Raphaël Badin (community) Approve
Review via email: mp+140922@code.launchpad.net

Commit message

Enforce IPMI 2.0 authentication (LP: #1086162)

To post a comment you must log in.
Revision history for this message
Raphaël Badin (rvb) wrote :

LGTM. I'd prefer the more verbose version of the param (i.e. --driver-type=LAN_2_0) but using -D is ok.

review: Approve
lp:~andreserl/maas/maas_ipmi_lan2.0 updated
1416. By Andres Rodriguez

Use verbose version of argument

Revision history for this message
Raphaël Badin (rvb) wrote :

I think this change broke all our automated tests in the lab:

In the lab, when I run:
ipmipower --driver-type=LAN_2_0 -h ip -u pw -p user --stat

I get: "ip: BMC error"

Should we change the IMPI settings to add a boolean parameter (LAN_v2) instead of making it the default?

Revision history for this message
Raphaël Badin (rvb) wrote :

Instead of a boolean, we could have a drop down choice with all the available driver types:
Excerpt from man ipmipower:
       -D IPMIDRIVER, --driver-type=IPMIDRIVER
              Specify the driver type to use instead of doing an auto selection. The currently available outofband drivers are LAN and LAN_2_0, which perform IPMI 1.5 and IPMI 2.0 respectively.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/provisioningserver/power/templates/ipmi.template'
--- src/provisioningserver/power/templates/ipmi.template 2012-10-06 16:23:49 +0000
+++ src/provisioningserver/power/templates/ipmi.template 2012-12-20 16:15:26 +0000
@@ -42,9 +42,9 @@
42issue_ipmi_command() {42issue_ipmi_command() {
43 # See https://launchpad.net/bugs/1053391 for details of this workaround43 # See https://launchpad.net/bugs/1053391 for details of this workaround
44 echo workaround |\44 echo workaround |\
45 ${ipmi_chassis_config} -h ${power_address} -u ${power_user} -p ${power_pass} --commit --filename ${config}45 ${ipmi_chassis_config} --driver-type=LAN_2_0 -h ${power_address} -u ${power_user} -p ${power_pass} --commit --filename ${config}
46 echo workaround |\46 echo workaround |\
47 ${ipmipower} -h ${power_address} -u ${power_user} -p ${power_pass} "$@"47 ${ipmipower} --driver-type=LAN_2_0 -h ${power_address} -u ${power_user} -p ${power_pass} "$@"
48}48}
4949
5050