Merge ~ddstreet/maas:lp1896684-28 into maas:2.8
Proposed by
Dan Streetman
Status: | Merged |
---|---|
Approved by: | Lee Trager |
Approved revision: | 843b1c54a4c01853dbdf7ae37929c92483d410fd |
Merge reported by: | MAAS Lander |
Merged at revision: | not available |
Proposed branch: | ~ddstreet/maas:lp1896684-28 |
Merge into: | maas:2.8 |
Diff against target: |
364 lines (+158/-43) 6 files modified
src/maasserver/dhcp.py (+13/-1) src/maasserver/models/node.py (+6/-11) src/maasserver/models/tests/test_node.py (+20/-0) src/maasserver/preseed_network.py (+26/-21) src/maasserver/tests/test_dhcp.py (+44/-10) src/maasserver/tests/test_preseed_network.py (+49/-0) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Lee Trager (community) | Approve | ||
MAAS Lander | Approve | ||
Review via email: mp+392313@code.launchpad.net |
Commit message
LP: #1896684 - If no subnet gateway, only use in-subnet dns addresses
If DHCP is not providing any gateway, it should not provide any
DNS server addresses that aren't directly reachable.
Similarly, if the network preseed is not configuring any gateway,
it should not provide per-interface DNS server addresses, nor default
dns server addresses, that aren't directly reachable.
Only apply rack DNS server address if subnet.allow_dns == True
To post a comment you must log in.
UNIT TESTS
-b lp1896684-28 lp:~ddstreet/maas/+git/maas into -b 2.8 lp:~maas-committers/maas
STATUS: SUCCESS 3dbdf7ae37929c9 2483d410fd
COMMIT: 843b1c54a4c0185