Merge lp://qastaging/~rvb/maas/di-api-bug-1456969 into lp://qastaging/~maas-committers/maas/trunk
Proposed by
Raphaël Badin
| Status: | Merged |
|---|---|
| Approved by: | Raphaël Badin |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 3921 |
| Proposed branch: | lp://qastaging/~rvb/maas/di-api-bug-1456969 |
| Merge into: | lp://qastaging/~maas-committers/maas/trunk |
| Diff against target: |
229 lines (+61/-4) 7 files modified
src/maasserver/api/nodes.py (+11/-0) src/maasserver/api/tests/test_enlistment.py (+4/-1) src/maasserver/api/tests/test_node.py (+8/-0) src/maasserver/api/tests/test_nodes.py (+16/-0) src/maasserver/forms.py (+13/-0) src/maasserver/testing/factory.py (+7/-3) src/maasserver/tests/test_forms_node.py (+2/-0) |
| To merge this branch: | bzr merge lp://qastaging/~rvb/maas/di-api-bug-1456969 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Blake Rouse (community) | Approve | ||
| Andres Rodriguez (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Expose the 'boot_type' field on the API. This controls whether the node will use curtin or di to install itself. The di installation is deprecated but before we fully support advanced networking and storage configuration in curtin, we still have to support di.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
lgtm!