Merge lp:~mpontillo/maas/subnet-dhcp-dns-settings--bug-1600720--2.0 into lp:maas/2.0
Proposed by
Mike Pontillo
Status: | Merged |
---|---|
Approved by: | Mike Pontillo |
Approved revision: | no longer in the source branch. |
Merged at revision: | 5163 |
Proposed branch: | lp:~mpontillo/maas/subnet-dhcp-dns-settings--bug-1600720--2.0 |
Merge into: | lp:maas/2.0 |
Diff against target: |
347 lines (+173/-63) 3 files modified
docs/changelog.rst (+3/-1) src/maasserver/dhcp.py (+59/-32) src/maasserver/tests/test_dhcp.py (+111/-30) |
To merge this branch: | bzr merge lp:~mpontillo/maas/subnet-dhcp-dns-settings--bug-1600720--2.0 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mike Pontillo (community) | Approve | ||
Review via email: mp+300211@code.launchpad.net |
Commit message
Merge revision 5169 from trunk.
Fix DHCP configuration to properly override subnet DNS with user-configured DNS. (This makes MAAS DHCP consistent with what curtin does.)
Drive-by fix to log an error when DHCP is enabled for a particular address family, but no subnet can be found. (Previous behavior was to silently fail to write the configuration; now if IPv6 is misconfigured, it will not prevent the IPv4 configuration from being written, and vice versa.)
To post a comment you must log in.
Self-reviewed backport.