Merge ~andreserl/maas:ipmi_boot_type_2 into maas:master
Proposed by
Andres Rodriguez
Status: | Merged |
---|---|
Merge reported by: | Andres Rodriguez |
Merged at revision: | 51503d2b13459e5b537691e5c4dd9992c3c0de68 |
Proposed branch: | ~andreserl/maas:ipmi_boot_type_2 |
Merge into: | maas:master |
Diff against target: |
117 lines (+22/-11) 5 files modified
src/maasserver/api/tests/test_enlistment.py (+1/-1) src/metadataserver/user_data/templates/snippets/maas_ipmi_autodetect.py (+2/-2) src/metadataserver/user_data/templates/snippets/tests/test_maas_ipmi_autodetect.py (+2/-2) src/provisioningserver/drivers/power/ipmi.py (+14/-5) src/provisioningserver/drivers/power/tests/test_ipmi.py (+3/-1) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
MAAS Lander | Needs Fixing | ||
Newell Jensen | Pending | ||
Review via email: mp+342128@code.launchpad.net |
Commit message
Change the IPMI_BOOT_TYPE options to be more user friendly.
This allows to specify the boot type with generalized options instead of forcing the user of freeipmi-tools terminology.
To post a comment you must log in.
UNIT TESTS
-b ipmi_boot_type_2 lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas
STATUS: FAILED maas-ci- jenkins. internal: 8080/job/ maas/job/ branch- tester/ 2088/console b537691e5c4dd99 92c3c0de68
LOG: http://
COMMIT: 51503d2b13459e5