Merge lp:~gmb/maas/backport-to-1.7-bug-1382108 into lp:maas/1.7
Proposed by
Graham Binns
Status: | Merged |
---|---|
Approved by: | Graham Binns |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3274 |
Proposed branch: | lp:~gmb/maas/backport-to-1.7-bug-1382108 |
Merge into: | lp:maas/1.7 |
Diff against target: |
107 lines (+75/-1) 2 files modified
src/maasserver/models/node.py (+12/-1) src/maasserver/models/tests/test_node.py (+63/-0) |
To merge this branch: | bzr merge lp:~gmb/maas/backport-to-1.7-bug-1382108 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Julian Edwards (community) | Approve | ||
Review via email: mp+239299@code.launchpad.net |
Commit message
Backport the fix for bug 1382108 to 1.7:
Don't write DHCP host maps when starting a node if its PXE MAC is not on a managed cluster interface, they are not needed. This also removes a related crash (see bug 1382108).
To post a comment you must log in.
Ah, this looks much better. If you can get someone who knows their stuff to review the actual code changes (I don't know the internal API well enough) this is clear to land in 1.7. Thanks!