Last commit made on 2016-10-07
Get this branch:
git clone -b master https://git.launchpad.net/~daniel-thewatkins/cloud-init/+git/cloud-init
Only Dan Watkins can upload to this branch. If you are Dan Watkins please log in for upload directions.

Branch merges

Branch information

Recent commits

c647183... by Dan Watkins on 2016-10-07

systemd: Run cloud-init.service Before dbus.socket

On Ubuntu (at least), cloud-init takes 25 seconds every time it fails to
resolve a DNS address. /etc/nsswitch.conf is configured to use the
"resolve" service, which communicates with systemd-resolved over DBUS.
When cloud-init runs, neither dbus.service nor systemd-resolved.service
have started, but dbus.socket _has_ started, so there is a socket for
the "resolve" NSS service to attempt to connect to. It waits for a
response over DBUS for 25 seconds before giving up and returning a
resolution failure.

This commit forces the DBUS socket to be started after cloud-init runs,
which means that the resolve NSS service fails immediately (rather than
after 25 seconds).

LP: #1629797

94fd35e... by Scott Moser on 2016-10-04

systemd: run cloud-init.service Before dbus.service

This is the best work around we have for an issue seen when dns is used
during cloud-init.service on a system that is configured in nsswitch
to use systemd-resolved. The problem is that cloud-init.service was
blocking basic.target, and dbus would not be available until after
cloud-init.service finished.

LP: #1629797

760a4f1... by Ryan Harper on 2016-10-04

unittests: fix use of mock 2.0 'assert_called' when running make check

Some of the new DigitalOcean unittests were written to use 'assert_called',
which is only available in mock versions 2.0. Because of this, the failure
would only occur in releases less than yakkety and not in 'tox'.

Add a 'xenial' entry to tox.ini with versions from xenial.

1071b99... by Wesley Wiedenmeier on 2016-08-28

Improve module documentation and doc cleanup.

This adds lots of config module documentation in a standard format.
It will greatly improve the content at readthedocs.
 * Add a 'doc' env to tox.ini
 * Changed default highlight language for sphinx conf from python to yaml
   most examples in documentation are yaml configs
 * Updated datasource examples to highlight sh code properly

02f6c4b... by St├ęphane Graber on 2016-09-29

lxd: Update network config for LXD 2.3

Prior to LXD 2.3, the bridge configuration was done through distro
packaging. Thus, lxd module interacted with debconf.
With 2.3 and higher, this is now done inside LXD itself, so we
need to use "lxc network" there.

For now, this perfectly matches what we had before with debconf and
doesn't cover any of the new options. We can always add those later.

A set of tests similar to what we had for debconf has been added to make
sure things look good.

This is tested in Yakkety container running LXD 2.3 and all options seem
to be passed through as expected, giving me the bridge I defined.

Signed-off-by: St├ęphane Graber <email address hidden>

9f83bb8... by Ben Howard on 2016-08-19

DigitalOcean: use meta-data for network configruation

On DigitalOcean, Network information is provided via Meta-data.
It changes the datasource to be a local datasource, meaning it
will run before fallback networking is configured.

The advantage of that is that before networking is configured it
can bring up a network device with ipv4 link-local and hit the
metadata service that lives at to find its networking
configuration. It then takes down the link local address and lets
cloud-init configure networking.

The configuring of a network device to go looking for a metadata
service is gated by a check of data in the smbios. This guarantees
that the code will not run on another system.

6d1edc3... by Scott Moser on 2016-09-28

ntp: move to run after apt configuration

since ntp module may try to install packages, it needs to run after
apt is configured.

LP: #1628337

0439d8a... by Robert Schweikert on 2016-09-15

Decode unicode types in decode_binary

The test in decode_binary for six.text_type was incorrect as that includes
unicode type in Python 2 which should actually be decoded.

When the type is string_types we now properly check only for basestring and
str in Python 2 and Python 3 respectively and return the given blob without
making an attempt to decode.

1b71b47... by Joshua Harlow on 2016-09-20

systemd: Ensure that cloud-init-local happens before NetworkManager

30d0adb... by Paul Meyer on 2016-08-25

Allow ephemeral drive to be unpartitioned

If device has no partition table, the first line of output from `sgdisk
-p <device>` will be "Creating new GPT entries.", instead of something
like "Disk /dev/sdb: 266338304 sectors, 127.0 GiB".

Also, protect against localized output by adjusting subp calls that
parse sgdisk output to set LANG=C.