Merge lp://qastaging/~julian-edwards/maas/ipmi-with-mac into lp://qastaging/~maas-committers/maas/trunk
Proposed by
Julian Edwards
Status: | Merged |
---|---|
Approved by: | Julian Edwards |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2029 |
Proposed branch: | lp://qastaging/~julian-edwards/maas/ipmi-with-mac |
Merge into: | lp://qastaging/~maas-committers/maas/trunk |
Diff against target: |
102 lines (+21/-8) 6 files modified
etc/maas/templates/power/ipmi.template (+6/-0) src/maasserver/models/node.py (+2/-2) src/maasserver/models/tests/test_node.py (+6/-4) src/maasserver/power_parameters.py (+5/-1) src/provisioningserver/power/tests/test_poweraction.py (+1/-1) src/provisioningserver/tasks.py (+1/-0) |
To merge this branch: | bzr merge lp://qastaging/~julian-edwards/maas/ipmi-with-mac |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jeroen T. Vermeulen (community) | Approve | ||
Review via email: mp+208286@code.qastaging.launchpad.net |
Commit message
Allow IPMI to define the MAC address of the BMC in its parameters, and use the ARPed IP address in preference to the IP address in power_address. This is the first exploratory step in removing power_address entirely because it is too unreliable in the face of changing DHCP addresses.
Description of the change
This branch has the side effect of fixing an AMT problem I just noticed - if someone was not setting any power parameters and relying on the node's mac address, the power_pass would never get sent to the template!
To post a comment you must log in.
Looks good, thanks!