lp:~smoser/cloud-init/trunk.fix-networking

Branch merges

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

cloud-init commiters: Pending requested 2016-06-02

Diff: 2765 lines (+1142/-688)

22 files modified

ChangeLog (+2/-0)
bin/cloud-init (+38/-22)
cloudinit/config/cc_emit_upstart.py (+1/-1)
cloudinit/config/cc_lxd.py (+2/-1)
cloudinit/distros/__init__.py (+6/-0)
cloudinit/helpers.py (+12/-10)
cloudinit/net/__init__.py (+221/-1)
cloudinit/sources/DataSourceCloudSigma.py (+5/-14)
cloudinit/sources/DataSourceConfigDrive.py (+70/-86)
cloudinit/sources/DataSourceNoCloud.py (+35/-45)
cloudinit/sources/DataSourceOpenNebula.py (+9/-35)
cloudinit/sources/DataSourceOpenStack.py (+2/-7)
cloudinit/sources/DataSourceSmartOS.py (+420/-173)
cloudinit/sources/__init__.py (+33/-0)
cloudinit/sources/helpers/openstack.py (+11/-7)
cloudinit/stages.py (+70/-25)
setup.py (+0/-1)
systemd/cloud-init-generator (+0/-3)
tests/unittests/test_datasource/test_configdrive.py (+77/-3)
tests/unittests/test_datasource/test_smartos.py (+128/-174)
udev/79-cloud-init-net-wait.rules (+0/-10)
udev/cloud-init-wait (+0/-70)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1577844: Drop unnecessary blocking of all net udev rules

Medium

Fix Released

Link a bug report

Related blueprints

1255. By Scott Moser on 2016-06-03

config drive conversion: recognize 'bridge' as a physical type, fix mtu

the network json in openstack provides a type of 'bridge' when
the underlying (host) type is a bridge. Silly, but we need to
consider that a physical device as it will be for us.

also, the 'mtu' will appear on the link, not on the route

1254. By Scott Moser on 2016-06-03

fix issue with routes on subnets not getting rendered

1253. By Scott Moser on 2016-06-03

avoid rendering 'lo' twice by not writing it in network config.

1252. By Scott Moser on 2016-06-03

lxd: fix log messsage

1251. By Scott Moser on 2016-06-03

ConfigDrive: do not use 'id' on a link for the device name

'id' on a link in the openstack spec should be "Generic, generated ID".
current implementation was to use the host's name for the host
side nic. Which provided names like 'tap-adfasdffd'.

We do not want to name devices like that as its quite unexpected
and non user friendly. So here we use the system name for any
nic that is present, but then require that the nics found also
be present at the time of rendering.

The end result is that if the system boots with net.ifnames=0
then it will get 'eth0' like names. and if it boots without net.ifnames
then it will get enp0s1 like names.

1250. By Scott Moser on 2016-06-02

merge with trunk

1249. By Scott Moser on 2016-06-02

re-add the 'Net' classes for datasources

When the .pkl file is loaded, the module that it is loaded
from must have the same symbol. Ie, if booted once and got
  DataSourceConfigDriveNet
then upgraded and rebooted, then next boot would show
  Can't get attribute 'DataSourceConfigDriveNet'

1248. By Scott Moser on 2016-06-02

fix untested previous change to smartos

1247. By Scott Moser on 2016-06-02

smartos: do not raise error when not on smartos

if get_smartos_environ() returned a None, then
the datasoure would raise a ValueError when get_data was called.
Fix that.

1246. By Scott Moser on 2016-06-02

eni parsing: support 'ether' in hwaddress, netmask and broadcast

this adds ability to support ENI that has:
 hwadress ether 36:4c:e1:3b:14:31
or
 hwaddress 36:4c:e1:3b:14:31

the former is written by openstack (at least on dreamhost).

Also, in the conversion of eni to network config support broadcast
and netmask.