Merge lp:~smoser/cloud-init/trunk.lp1602373 into lp:~cloud-init-dev/cloud-init/trunk
Status: | Merged |
---|---|
Merged at revision: | 1255 |
Proposed branch: | lp:~smoser/cloud-init/trunk.lp1602373 |
Merge into: | lp:~cloud-init-dev/cloud-init/trunk |
Diff against target: |
259 lines (+155/-14) 5 files modified
cloudinit/distros/__init__.py (+26/-2) cloudinit/net/eni.py (+21/-3) cloudinit/sources/DataSourceConfigDrive.py (+17/-9) tests/unittests/test_distros/test_netconfig.py (+60/-0) tests/unittests/test_net.py (+31/-0) |
To merge this branch: | bzr merge lp:~smoser/cloud-init/trunk.lp1602373 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
cloud-init Commiters | Pending | ||
Review via email: mp+300021@code.launchpad.net |
Commit message
ConfigDrive: fix writing of 'injected' files and legacy networking
Previous commit inadvertently disabled the consumption of 'injected' files
in configdrive (openstack server boot --file=
unless the datasource was in 'pass' mode. The default mode is 'net' so
that would never happen.
Also here are:
a.) some comments to apply_network_
b.) add backwards compatibility for distros that do not yet implement
apply_
and calling apply_network.
This is required because prior to the previous commit, those distros
would have had 'apply_network' called with the openstack provided
ENI file. But after this change they will have apply_network_
called by cloudinit's main.
c.) add network_
it supports the not-actually-