Last commit made on 2016-12-07
Get this branch:
git clone -b bug/1647910 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

479cbd2... by Lars Kellogg-Stedman

set_hostname: avoid erroneously appending domain to fqdn

In some situations, cloud-init will erroneously append a default
domain to an already fully qualified hostname, resulting in something
like 'localhost.localdomain.localdomain'. This patch checks to see if
the value returned by util.get_hostname() contains a '.', and if it
does treats it as a fully qualified name.

Resolves: rhbz#1389048
LP: #1647910

166df60... by Scott Moser

fix decoding of utf-8 chars in yaml test

Python 3 would fail to load yaml from doc/examples/cloud-config-apt.txt
when the LANG (specifically LC_CTYPE) was 'C'.

The changes here do 2 things:
 a.) remove the non-ascii characters from the yaml file.
 b.) fix the validate-yaml.py program to decode using utf-8 specifically
     rather than using the inherited settings.

This fixes it now for ascii and in the future also should non-ascii slip in.

f6d5dc4... by Joshua Harlow

Replace usage of sys_netdev_info with read_sys_net

I've seen cases of unable to read from files as
well as the existing os errors so catch io error
and skip by using the smarter read_sys_net instead.

LP: #1625766

3ac34f5... by Joshua Harlow

fix problems found in python2.6 test.

These are just simple syntax fixes to work correctly on python2.6.
Found when testing in a centos 6 container.

2d2ec70... by Scott Moser

OpenStack: extend physical types to include hyperv, hw_veb, vhost_user.

This extends the list of device 'types' that are considered to be physical
to include hyperv, hw_veb, and vhost_user.

LP: #1642679

8c6878a... by Scott Moser

tests: fix assumptions that expected no eth0 in system.

The previous commit added tests that would fail on any system that had
a nic named eth0 or eno1. The changes here supply the expected macs to
the function being tested so it does not query the system.

LP: #1644043

6e92c5f... by Scott Moser

net/cmdline: Consider ip= or ip6= on command line not only ip=

The previous behavior would miss ip6= on the command line and
would not pay attention to the written net-* or net6-* files if
only ip6= was found.

The fix here enables parsing the files if either ip= or ip6= is found,
and adds some tests as well.

LP: #1639930

11b1aba... by Joshua Harlow

Just use file logging by default

Instead of being dependent on the availability of syslog that
various distributions may not enable or configure correctly
or they do so via patches just use a known-to-work default
logging mechanism. If distros want to change this, that
is fine, but at least the built-in one will work reliably.

LP: #1643990

0fd1dd0... by Wesley Wiedenmeier

Improve formatting for ProcessExecutionError

This replaces long single lines in a log or console output
with multiple lines that are much easier to read.
It indents the stdout and stderr so logs are more easily
read also.

bc4d9c5... by Scott Moser

flake8: fix trailing white space