Last commit made on 2017-02-17
Get this branch:
git clone -b lp/1665441 https://git.launchpad.net/~larsks/cloud-init
Only Lars Kellogg-Stedman can upload to this branch. If you are Lars Kellogg-Stedman please log in for upload directions.

Branch merges

Branch information


Recent commits

07ef7f2... by Lars Kellogg-Stedman

correct errors in cloudinit/net/sysconfig.py

There were some logic errors in sysconfig.py that appear to be the
result of accidentally typing "iface" where it should have been
"iface_cfg". This patch corrects those problems so that the module
can run successfully.

LP: #1665441
Resolves: rhbz#1389530

5e8bd6b... by Lars Kellogg-Stedman

unit tests for #1665441

This adds inputs and outputs to OS_SAMPLES to test the code path for a
network configuration that provides multiple subnets on the same
interface. This test will fail until the fix for #1665441 is

LP: #1665441

1cd8cfa... by Scott Moser

apply the runtime configuration written by ds-identify.

When the ds-identify code landed, it started writing /run/cloud.cfg
but at the moment, nothing was reading that. The result is that
ds-identify only worked to disable cloud-init entirely.

65529b6... by Scott Moser

ds-identify: fix checking for filesystem label

has_fs_with_label regressed when refactoring to not have leading
and trailing , in DI_FS_LABELS.

LP: #1663735

e6098c2... by Scott Moser

ds-identify: read ds=nocloud properly

The nocloud datasource specifically would look for ds=nocloud or
ds=nocloud-net (often augmented with 'seedfrom') on the kernel command line.
Fix to return DS_FOUND in that case.

LP: #1663723

0df21b6... by Scott Moser

support nova-lxd by reading platform from environment of pid 1.

Nova lxd will now put the environment variable 'platform' into
pid 1's environment to the value 'OpenStack Nova', which is the same as
you would find in kvm guests.

LP: #1661797

7f85a3a... by Scott Moser

ds-identify: change aarch64 to use the default for non-dmi systems.

aarch64 does support dmi, but OpenStack does not populate guests
with this information, and there are currently bugs in qemu preventing
it from working correctly see bug #1663304 for more information.

So, for the time being, pretend as if there is no dmi data on aarch64,
which will make it enable cloud-init even when no datasources are found.

3bcb72c... by Joshua Powers

Remove style checking during build and add latest style checks to tox

- make check will no longer run the style checks, that way package builds
  wont fail on a style difference in versions of the style tools in
  that distro.
- created style-check make file target to continue to run pep8 and pyflakes
- added tox envs 'tip-pycodestyle' and 'tip-pyflakes' to run latest style
  checking. These are not enabled by default run of tox.

LP: #1652329

5f14a0b... by Joshua Powers

code-style: make master pass pycodestyle (2.3.1) cleanly, currently:

$ pycodestyle cloudinit/ tests/ tools/
tools/make-mime.py:25:5: E722 do not use bare except'
tools/mock-meta.py:252:17: E722 do not use bare except'

For tools/make-mime.py:25:5: E722 do not use bare except' the use case is
when someone runs
    ./make-mime.py --attach commis
instead of
    ./make-mime.py --attach commissaire.txt:x-commissaire-host

The split can cause a ValueError potentially if there is no:

For tools/mock-meta.py:262:17: E722 do not use bare except' the use case is
a dictionary look up occurs potentially when an unknown key is given:
    key_name = key_ids[key_id]

Do note that version 2.3.0 falsely reported a dozen or so E302 and E306

e987092... by Scott Moser

manual_cache_clean: When manually cleaning touch a file in instance dir.

When manual_cache_clean is enabled, write a file to
/var/lib/cloud/instance/manual-clean. That file can then be read by
ds-identify or another tool to indicate that manual cleaning is in place.