Merge ~smoser/cloud-init:fix/1798117-allow-toplevel-network-in-network-config into cloud-init:master
Proposed by
Scott Moser
Status: | Merged |
---|---|
Approved by: | Scott Moser |
Approved revision: | a1337d0c644e80d40c38d153338082b53de44c63 |
Merge reported by: | Server Team CI bot |
Merged at revision: | not available |
Proposed branch: | ~smoser/cloud-init:fix/1798117-allow-toplevel-network-in-network-config |
Merge into: | cloud-init:master |
Diff against target: |
262 lines (+97/-35) 2 files modified
cloudinit/sources/DataSourceNoCloud.py (+31/-1) tests/unittests/test_datasource/test_nocloud.py (+66/-34) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Scott Moser | Approve | ||
Server Team CI bot | continuous-integration | Approve | |
Chad Smith | Approve | ||
Review via email: mp+356850@code.launchpad.net |
Commit message
NoCloud: Allow top level 'network' key in network-config.
NoCloud's 'network-config' file was originally expected to contain
network configuration without the top level 'network' key. This was
because the file was named 'network-config' so specifying 'network'
seemed redundant.
However, JuJu is currently providing a top level 'network' config when
it tries to disable networking ({"network": {"config": "disabled"}).
Other users have also been surprised/confused by the fact that
a network config in /etc/cloud/
what was expected in 'network-config'.
LP: #1798117
Description of the change
see commit message
To post a comment you must log in.
PASSED: Continuous integration, rev:02d7c7bfdef ceb71db86cec0ca 09dea49576fc34 /jenkins. ubuntu. com/server/ job/cloud- init-ci/ 394/
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/ 394/rebuild
https:/