~oddbloke/cloud-init/+git/cloud-init:net

Branch merges

Propose for merging

Merged into cloud-init:master

Chad Smith: Approve on 2019-09-27

Server Team CI bot: Approve (continuous-integration) on 2019-09-27

Diff: 89 lines (+17/-16)

3 files modified

cloudinit/distros/debian.py (+6/-5)
cloudinit/distros/ubuntu.py (+2/-2)
tests/unittests/test_distros/test_netconfig.py (+9/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

4869a19... by Dan Watkins on 2019-09-27

debian: add missing word to NETWORK_FILE_HEADER message

Specifically, make it clearer that networking is regenerated every boot.

LP: #1845669

deea59d... by Dan Watkins on 2019-09-27

debian/ubuntu: rename ENI_HEADER to more apropos NETWORK_FILE_HEADER

It's used in both ENI and netplan files, so improve the name.

762f230... by Ryan Harper on 2019-09-27

ovf: do not generate random instance-id for IMC customization path

Cloud-init will not operate properly if the instance-id value changes
on each boot. This is the source of a number of behavioral bugs filed
against cloud-init with OVF datasource. Instead, use a static instance-id
value, iid-vmware-imc, similar to iid-dsovf.

f80f7f0... by Ryan Harper on 2019-09-26

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

0948cdf... by Ryan Harper on 2019-09-26

sysconfig: use distro variant to check if available

The sysconfig renderer used the distro name directly which mean
some variants of distros were not considered supported. Fix this
by using util.system_info()['variant'] instead. Fix the list of
KNOWN_DISTROS value for redhat -> rhel.

LP: #1843584

66ef979... by Robert Schweikert on 2019-09-26

systemd/cloud-init.service.tmpl: start after wicked.service

Change the startup order. On SUSE distros cloud-init.service
should start after wicked.service. This reflects the same
start up order other distributions utilize.

b19177e... by Chad Smith on 2019-09-26

docs: fix zstack documentation lints

Resolve the following lints raised by 'make doc':
- doc/rtd/topics/datasources/zstack.rst:5: D001 Line too long
- doc/rtd/topics/datasources/zstack.rst:10: D001 Line too long

0cbcd22... by Dan Watkins on 2019-09-25

analyze/show: remove trailing space in output

18286fc... by Brian Candler on 2019-09-25

Add missing space in warning: "not avalid seed"

9faa8d5... by Ryan Harper on 2019-09-25

pylintrc: add 'enter_context' to generated-members list

On Bionic (python 3.6.8) we now see no-member errors on untouched code.
This does not reproduce on Xenial (3.5) nor on Eoan (3.7.4). The source
of the failure was the release of astroid 2.3.0 vs. 2.2.5. Resolve this
by adding the member attribute to the generated member list in pylintrc.
This fixes CI failures.