MAAS

Merge lp://staging/~lamont/maas/bug-1636251-1.9 into lp://staging/maas/1.9

  1. bug-1636251-1.9
  2. Merge into 1.9
Proposed by LaMont Jones
Status: Merged
Approved by: LaMont Jones
Approved revision: no longer in the source branch.
Merged at revision: 4596
Proposed branch: lp://staging/~lamont/maas/bug-1636251-1.9
Merge into: lp://staging/maas/1.9
Diff against target: 66 lines (+20/-3)
3 files modified
docs/changelog.rst (+2/-0)
src/maasserver/preseed_network.py (+6/-1)
src/maasserver/tests/test_preseed_network.py (+12/-2)
To merge this branch: bzr merge lp://staging/~lamont/maas/bug-1636251-1.9
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
Review via email: mp+309189@code.staging.launchpad.net

Commit message

The domain for the node needs to be listed first in the search directive in resolv.conf.

Description of the change

The domain for the node needs to be listed first in the search directive in resolv.conf.

To post a comment you must log in.
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Fix looks good, but I'm not quite sure how the test tests this specific fix?

review: Needs Information
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Ah, I didn't realize the first argument to the NodeGroup factory was the domain name. Never mind on part of my comment, but I still wonder where in the test we make sure the node's domain comes first?

Revision history for this message
LaMont Jones (lamont) wrote :

> Ah, I didn't realize the first argument to the NodeGroup factory was the
> domain name. Never mind on part of my comment, but I still wonder where in the
> test we make sure the node's domain comes first?

collectDNSConfig in the test file generates the expected config, and has been changed to always put the domain portion of the fqdn of the node in ahead of the sorted dns search list (and pruning dupes as it goes.)

Revision history for this message
Mike Pontillo (mpontillo) wrote :

Got it. Sounds good; thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches