~oddbloke/cloud-init/+git/cloud-init:ubuntu/cosmic

Branch merges

Propose for merging

Merged into cloud-init:ubuntu/cosmic at revision 8a333cd26244781fa6b8114411325a681be72122

Ryan Harper: Approve on 2019-03-11

Server Team CI bot: Needs Fixing (continuous-integration) on 2019-03-11

Diff: 2241 lines (+1159/-164)

52 files modified

.gitignore (+1/-0)
cloudinit/cmd/clean.py (+14/-13)
cloudinit/cmd/tests/test_clean.py (+4/-2)
cloudinit/config/cc_apt_pipelining.py (+2/-2)
cloudinit/config/cc_chef.py (+3/-0)
cloudinit/config/cc_rsyslog.py (+1/-1)
cloudinit/config/schema.py (+1/-1)
cloudinit/config/tests/test_apt_pipelining.py (+28/-0)
cloudinit/distros/__init__.py (+9/-4)
cloudinit/handlers/upstart_job.py (+1/-1)
cloudinit/net/netplan.py (+2/-1)
cloudinit/net/network_state.py (+2/-2)
cloudinit/net/tests/test_dhcp.py (+1/-0)
cloudinit/netinfo.py (+5/-2)
cloudinit/safeyaml.py (+7/-0)
cloudinit/sources/DataSourceAzure.py (+9/-4)
cloudinit/sources/DataSourceEc2.py (+22/-1)
cloudinit/sources/DataSourceOVF.py (+3/-1)
cloudinit/sources/helpers/azure.py (+78/-31)
cloudinit/sources/helpers/openstack.py (+6/-6)
cloudinit/stages.py (+2/-2)
cloudinit/tests/helpers.py (+2/-21)
cloudinit/tests/test_netinfo.py (+14/-0)
cloudinit/url_helper.py (+1/-1)
cloudinit/util.py (+11/-17)
debian/changelog (+42/-0)
debian/cloud-init.lintian-overrides (+4/-0)
debian/cloud-init.postinst (+0/-14)
debian/control (+4/-5)
doc/examples/cloud-config-chef.txt (+3/-0)
doc/examples/cloud-config-disk-setup.txt (+17/-2)
doc/rtd/topics/datasources/ec2.rst (+11/-0)
doc/rtd/topics/instancedata.rst (+1/-1)
doc/rtd/topics/merging.rst (+84/-6)
templates/chef_client.rb.tmpl (+4/-1)
tests/cloud_tests/verify.py (+7/-2)
tests/data/azure/parse_certificates_fingerprints (+4/-0)
tests/data/azure/parse_certificates_pem (+152/-0)
tests/data/azure/pubkey_extract_cert (+13/-0)
tests/data/azure/pubkey_extract_ssh_key (+1/-0)
tests/data/netinfo/freebsd-ifconfig-output (+17/-0)
tests/data/netinfo/freebsd-netdev-formatted-output (+11/-0)
tests/unittests/test_datasource/test_azure.py (+2/-3)
tests/unittests/test_datasource/test_azure_helper.py (+65/-6)
tests/unittests/test_datasource/test_configdrive.py (+27/-8)
tests/unittests/test_datasource/test_ec2.py (+24/-0)
tests/unittests/test_distros/test_create_users.py (+28/-0)
tests/unittests/test_distros/test_netconfig.py (+1/-1)
tests/unittests/test_ds_identify.py (+1/-1)
tests/unittests/test_handler/test_handler_chef.py (+3/-0)
tests/unittests/test_net.py (+397/-0)
tools/cloud-init-per (+7/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

8a333cd... by Dan Watkins on 2019-03-08

d/postinst: remove now-incorrect apt pipelining configuration

bbcab8f... by Dan Watkins on 2019-03-07

Change Maintainer to Ubuntu Developers

e5beecc... by Dan Watkins on 2019-03-07

Override lintian warnings about WantedBy=cloud-init.target

d3a8647... by Dan Watkins on 2019-03-07

Change Priority from extra to optional

57b9dbf... by Dan Watkins on 2019-03-07

Fix build-depends-on-obsolete-package for dh-systemd

324fa96... by Dan Watkins on 2019-03-07

Update netplan dependency package (LP: #1813667)

6c4fdcd... by Dan Watkins on 2019-03-11

update changelog (New upstream snapshot 18.5-45-g3554ffe8).

380d954... by Dan Watkins on 2019-03-11

merge from master at 18.5-45-g3554ffe8

3554ffe... by Ryan Harper on 2019-03-08

cloud-init-per: POSIX sh does not support string subst, use sed

cloud-init-per is run via /bin/sh which requires POSIX shell
compliance and does not implement string substitution like
bash. Replace these calls with use of sed.

LP: #1819222

7c07af2... by Scott Moser on 2019-03-06

Support locking user with usermod if passwd is not available.

In some cases, the 'passwd' command might not be available, but
'usermod' might be. In debian systems both are provided by the
'passwd' package. In Redhat/Centos passwd comes from 'passwd' package
while 'usermod' comes from `shadow-utils`

This should just support either one with no real cost other than
the check.