Merge ~raharper/cloud-init:fix/sysconfig-skip-resolvconf-no-dns-config into cloud-init:master
Proposed by
Ryan Harper
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Ryan Harper | ||||
Approved revision: | 6ac5b74e1a91cfad0edb999bfbbad9715ccd68a2 | ||||
Merge reported by: | Server Team CI bot | ||||
Merged at revision: | not available | ||||
Proposed branch: | ~raharper/cloud-init:fix/sysconfig-skip-resolvconf-no-dns-config | ||||
Merge into: | cloud-init:master | ||||
Diff against target: |
68 lines (+16/-2) 2 files modified
cloudinit/net/sysconfig.py (+4/-2) tests/unittests/test_net.py (+12/-0) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Server Team CI bot | continuous-integration | Approve | |
Dan Watkins | Approve | ||
Review via email: mp+372727@code.launchpad.net |
Commit message
sysconfig: only write resolv.conf if network_state has DNS values
If an OS image provided an /etc/resolv.conf file that was not empty
cloud-init would read and re-write it with a cloud-init header even
if no DNS network configuration was provided (e.g. DHCP only).
This can cause problems for some network services which don't
ignore cloud-init's header.
LP: #1843634
To post a comment you must log in.
PASSED: Continuous integration, rev:cc70b43e9be cd6a469ed17430c 5907b85b5f2b2d /jenkins. ubuntu. com/server/ job/cloud- init-ci/ 1139/
https:/
Executed test runs:
SUCCESS: Checkout
SUCCESS: Unit & Style Tests
SUCCESS: Ubuntu LTS: Build
SUCCESS: Ubuntu LTS: Integration
IN_PROGRESS: Declarative: Post Actions
Click here to trigger a rebuild: /jenkins. ubuntu. com/server/ job/cloud- init-ci/ 1139//rebuild
https:/