Last commit made on 2017-01-25
Get this branch:
git clone -b net-dont-use-alias https://git.launchpad.net/~raharper/cloud-init
Only Ryan Harper can upload to this branch. If you are Ryan Harper please log in for upload directions.

Branch merges

Branch information


Recent commits

97cb564... by Ryan Harper

Fix eni rendering of multiple IPs per interface

The iface:alias syntax for eni rendering is brittle with ipv6.
Replace it with using multiple iface stanzas with the same iface
name which is supported. Side-effect is that one can no longer
do 'ifup $iface:$alias' but requires instead use of ip address
{add|delete} instead.

LP: #1657940

65e01b4... by Scott Moser

tests: remove executable bit on test_net, so it runs, and fix it.

The test_user_data_normalize and test_net files had gotten
the executable bit set, and thus are skipped by nose by default.
We could set run with the --exe flag, but they should not have
gotten this way.

Other changes here:
 * replace TempDirTestCase with CiTestCase, which has some nice
   tmp_dir() and tmp_path() functions. Going forward the intent
   is to have CiTestCase be the base test case for tests.
 * test_net: switch to CiTestCase and fix usage that was
   silently broken, because of exe bit.
 * populate_dir: return the list of files that it writes rather
   than having no return value.
 * CiTestCase:
    * support tmp_path("foo") that returns a full path to 'foo'
      under a tmpdir.
    * add tmp_dir() to get a temp dir and clean up.

8e9e47f... by Scott Moser

tests: No longer monkey patch httpretty for python 3.4.2

No shipping ubuntu has a python 3.4 that is less than 3.4.2.
Remove this workaround to avoid unnecessary complexity.

This reverts 04a60cf949.

853df0a... by Lars Kellogg-Stedman

Add 3 ecdsa-sha2-nistp* ssh key types now that they are standardized

cloud-init adds ssh_authorized_keys to the default user and to
root but for root it disables the keys with a prefix command.
However, if the public_key key is of type ecdsa-sha2-nistp521,
it is not parsed correctly, and the prefix command is not prepended.

Resolves: rhbz#1151824
LP: #1658174

d3fbb5d... by Lars Kellogg-Stedman

reset httppretty for each test

this ensures that we call httpretty.reset() before calling
httppretty.register_uri(...), which ensures that we get a fresh
callback with the expected version of the metadata.

LP: #1658200

a3376d4... by Scott Moser

build: fix running Make on a branch with tags other than master

running 'make' on a git branch other than master would fail with
complaint that the tools/read-version reported a different version
than the code.

Change to only consider tags starting with 0-9 in read-version.

b71592c... by Andrew Jorgensen

EC2: Do not cache security credentials on disk

On EC2, instance metadata can include credentials that remain valid for as
much as 6 hours. Reading these and allowing them to be pickled represents
a potential vulnerability if a snapshot of the disk is taken and shared as
part of an AMI.

This skips security-credentials when walking the meta-data tree.

LP: #1638312
Reviewed-by: Ian Weller <email address hidden>
Reviewed-by: Ben Cressey <email address hidden>
Reported-by: Kyle Barnes <email address hidden>

145410f... by "Erik M. Bray" <email address hidden>

doc: Fix typos and clarify some aspects of the part-handler

The existing documentation referred to a handle_type method when it
really should be handle_part. It also referred to 'methods' when it
really should say 'functions' to be clear (while it's true the built-in
handlers are classes with methods of these names, in this context we
mean module-level functions).

Also clarified that a part-handler should come before the parts that
it handles, and can override built-in handlers.

47680bd... by Scott Moser

doc: add some documentation on OpenStack datasource.

This just fills out some of the documentation on the OpenStack datasource.

4cf53f1... by Lars Kellogg-Stedman

OpenStack: Use timeout and retries from config in get_data.

This modifies get_data in DataSourceOpenStack.py to get the timeout
and retries values from the data source configuration, rather than
from keyword arguments. This permits get_data to use the same timeout
as other methods, and allows an operator to increase the timeout in
environments where the metadata service takes longer than five seconds
to respond.

LP: #1657130
Resolves: rhbz#1408589