lp:~smoser/cloud-init/trunk.lp1602373

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~cloud-init-dev/cloud-init/trunk at revision 1255

cloud-init Commiters: Pending requested 2016-07-14

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1602373: cloud-init doesn't always land files that one expects

High

Fix Released

Link a bug report

Related blueprints

1250. By Scott Moser on 2016-07-14

flake8

1249. By Scott Moser on 2016-07-14

add test of apply_network fallback path.

we could do this more simply by mocking fbsd.apply_network
and checking it's inputs. but this pushes it through the whole
path that the other test does.

1248. By Scott Moser on 2016-07-14

merge from trunk

1247. By Scott Moser on 2016-07-14

pass the return back up, shorten lines some.

1246. By Scott Moser on 2016-07-14

ConfigDrive: write 'injected' files and legacy networking

Previous commit disabled the consumption of 'injected' files in
configdrive (openstack server boot --file=/target/file=local-file)
unless the datasource was in 'pass' mode. The default mode is 'net'
so that would never happen.

Also here are:
a.) a fix for 'links_path_prefix' string from debian, to finally
    disable the rendering of systemd.link files (LP: #1594546)
b.) some comments to apply_network_config
c.) implement a backwards compatibility for for distros that do
    not yet implement apply_network_config by converting the network
    config into ENI format 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_config
    called by cloudinit's main.
d.) a network_state_to_eni helper for converting net config to eni
    it supports the not-actually-correct 'hwaddress' field in ENI.

1245. By Scott Moser on 2016-06-22

user_data: fix error when user-data is not utf-8 decodable

when user-data was not decodable, cloud-init would raise exception.
This also changes the signature of user_data.convert_string.
The 'headers' argument was never used, and woudl have been broken
if it was, as it was expected to be a dictionary but then was
passed in with *headers.

1244. By Scott Moser on 2016-06-21

write_files: if no permissions are given, just use default without warn.

if no permissions were given in a write_files stanza, then
a warning would be emitted.

The fix here is just to special case handling of None.

1243. By Scott Moser on 2016-06-20

do not render systemd.link files

When fixing bug 1579130, we made cloud-init rename devices itself,
rather than relying on the systemd.link files to do that.
That was necessary to
 - rename devices in a container
 - rename devices on first boot or in any situation when the
   link files in the initramfs were stale.

However, cloud-init was still writing .link files like:
 /etc/systemd/network/50-cloud-init-ens2.link

That leads to just a confusing situation as cloud-init will trump
any renaming systemd does in all cases.

Also added here is a header into the rendered ENI file:
 /etc/network/interfaces.d/50-cloud-init.cfg

that describes how to disable cloud-init networking.

1242. By Scott Moser on 2016-06-16

support network rendering to sysconfig (for centos and RHEL)

This intends to add support for rendering of network data under sysconfig
distributions (centos and rhel). The end result will be support for
network configuration via ConfigDrive or NoCloud on these OS.

1241. By Scott Moser on 2016-06-16

DataSourceNoCloud: fix stack trace on reboot, default to dsmode=net

On reboot (loading module from obj.pkl) we would hit a AttributeError
when trying to access cmdline_id.
Addtionally, dsmode was inadvertantly defaulting to local for
DataSourceNoCloud.