Merge lp:~rvb/maas/fix-etc-hosts-bug-1087183-2 into lp:~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: | 3253 |
Proposed branch: | lp:~rvb/maas/fix-etc-hosts-bug-1087183-2 |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
28 lines (+6/-2) 2 files modified
src/maasserver/compose_preseed.py (+5/-1) src/maasserver/tests/test_compose_preseed.py (+1/-1) |
To merge this branch: | bzr merge lp:~rvb/maas/fix-etc-hosts-bug-1087183-2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Christian Reis (community) | Approve | ||
Graham Binns (community) | Approve | ||
Review via email: mp+236709@code.launchpad.net |
Commit message
Use the default /etc/hosts/ instead of having cloud-init override it.
Description of the change
For a long discussion about why we need this change, see the related bug. In short: we want dns_resolve(
Packages built using this branch are available for testing in https:/
To post a comment you must log in.
I'm not landing this just now as we want people to test it first.
fwiw, this is what happens on a deployed node with the current config: http:// paste.ubuntu. com/8473237/
This is what happens with this change: http:// paste.ubuntu. com/8473238/
The only difference is on the last line.