~nicktimko/cloud-init:master

Last commit made on 2017-07-18
Get this branch:
git clone -b master https://git.launchpad.net/~nicktimko/cloud-init
Only Nick Timkovich can upload to this branch. If you are Nick Timkovich please log in for upload directions.

Branch merges

Branch information

Name:
master
Repository:
lp:~nicktimko/cloud-init

Recent commits

d1e8eb7... by Ryan Harper

sysconfig: include GATEWAY value if set in subnet

Render the GATEWAY= value in interface files which have a gateway in the
subnet configuration.

LP: #1686856

e80517a... by Julien Castets

Scaleway: add datasource with user and vendor data for Scaleway.

Here we add and enable by default a datasource for Scaleway cloud.
The datasource quickly exits unless one of three things:
 a.) 'Scaleway' found as the system vendor
 b.) 'scaleway' found on the kernel command line.
 c.) the directory /var/run/scaleway exists (this is currently created
     by the scaleway initramfs module).

One interesting bit of this particular datasource is that it requires
the source port of the http request to be < 1024.

be8e84b... by Scott Moser

Support comments in content read by load_shell_content.

load_shell_content previously would not allow shell comment characters
in the content being parsed. If comments=True is not passed then an
exception would previously be raised as the line would not be guaranteed to
have an '=' in it.

7ed3cb3... by Hongjiang Zhang

cloudinitlocal fail to run during boot

There is a circular dependence in cloudinitlocal, which caused it
to fail. As a result, cloud-init failed to find data source on Azure.

fc89390... by Sandor Zeestraten

doc: fix disk setup example table_type options

This fixes the disk setup example doc which specifies that the only
currently supported table_type option is 'mbr' by adding the 'gpt'
option which got supported as of 0.7.7.

LP: #1703789

b6c478e... by =?utf-8?q?Joonas_Kylm=C3=A4l=C3=A4?= <email address hidden>

tools: Fix exception handling.

We should be expecting IndexError instead of KeyError because we are
using a list (key_ids) and not a dictionary. Also, thanks to Emmanuel
Kasper for pointing out the wrong response code.

LP: #1701527

7b13279... by Scott Moser

tests: fix usage of mock in GCE test.

The usage of mock in this test was simply invalid and only worked by
happenstance.

812c368... by Chad Smith

test_gce: Fix invalid mock of platform_reports_gce to return False

The mock of platform_reports_gce is created with a True return value in
tests/unittests/test_datasource/test_gce.py:TestDataSourceGCE.setUp().
But, the final test_get_data_returns_false_if_not_on_gce incorrectly
attempts to override the mocked return_value of True to False by setting
self.m_platform_gce.return_value = False. But, since the mock is already
initialized, the updated False is not honored. Instead we should use the
patch decorator on the specific unit test to override the return_value of
DataSourceGCE.platform_reports_gce to False.

A False from platform_reports_gce allows DataSourceGCE.get_data to
immediately return False instead of trying to contact
metadata.google.internal as the related bug references.

0677216... by Joshua Powers

test: fix incorrect keyid for apt repository.

The test is currently importing the incorrect keyid. It specifies
the curtin developers ppa, rather than the cloud-init ppa. On
Artful this causes failures as a check is made to verify the
correct key is imported for the ppa, whereas on previous releases
only a warning was issued.

Also, change to use a full key fingerprint.

LP: #1702717

32e9a4d... by Joshua Powers

tests: Update version of pylxd

With the upgrade to lxd 2.15, pylxd version 2.2.3 broke.
Upgrading to version 2.2.4 fixes issues with missing attributes.