Last commit made on 2016-10-08
Get this branch:
git clone -b yaml-check-python https://git.launchpad.net/~harlowja/cloud-init
Only Joshua Harlow can upload to this branch. If you are Joshua Harlow please log in for upload directions.

Branch merges

Branch information


Recent commits

d9dbd15... by Joshua Harlow on 2016-10-08

Run validate yaml with python version matched

We are finding a valid python version, which
may be in a virtualenv, with say pyyaml installed
so when running validate-yaml.py it is very useful
to explicitly run it with the python version found
instead of always python3.

808edb1... by Scott Moser on 2016-09-20

MAAS: improve the main of datasource to look at kernel cmdline config.

This just looks in one other maas related path for a config file.
The file '91_kernel_cmdline_url' is written by cloud-init when it
gets a cloud-config-url parameter.

Also now we read the config even if a url is specified to potentially
fill in credentials.

c4aeba3... by Scott Moser on 2016-09-30

tests: silence the Cheetah UserWarning about NameMapper C version.

This silences a warning made by Cheetah in pip installed environments:
  UserWarning: You don't have the C version of NameMapper installed!
  I'm disabling Cheetah's useStackFrames option ...

The reason for the monkey patching is that the warning goes to stderr
during nose and breaks up its expected output. The side affect of it
is that tests would run with Cheetah's 'useStackFrames'
enabled which is "painfully slow with the Python version of NameMapper".

6e45ffb... by Dan Watkins on 2016-10-07

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

The change reported to fix bug 1629797 was incorrect. It added:
and its commit message referenced dbus.service.
dbus.target does not exist, and dbus.service would not solve the
problem. The change did not fix the problem nor actually make any

The fix here is just to use Before=dbus.socket.

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