~akaris/cloud-init:bug1679817-c

Branch merges

Propose for merging

Merged into cloud-init:master at revision f38fa41317602908139aa96e930b634f65e39555

Scott Moser: Approve on 2017-05-23

Server Team CI bot: Approve (continuous-integration) on 2017-05-17

Diff: 458 lines (+199/-132)

3 files modified

cloudinit/net/sysconfig.py (+174/-70)
tests/unittests/test_distros/test_netconfig.py (+3/-5)
tests/unittests/test_net.py (+22/-57)

api

Merged into cloud-init:master at revision 1a401c57978855b5d56ac23976252e2506d206fa

Server Team CI bot: Approve (continuous-integration) on 2017-05-31

cloud-init Commiters: Pending requested 2017-05-17

Diff: 453 lines (+194/-132)

3 files modified

cloudinit/net/sysconfig.py (+169/-70)
tests/unittests/test_distros/test_netconfig.py (+3/-5)
tests/unittests/test_net.py (+22/-57)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

48bf21b... by Andreas Karis on 2017-04-22

Fix dual stack IPv4/IPv6 configuration for RHEL

Dual stack IPv4/IPv6 configuration via config drive is broken for RHEL7.
This patch fixes several scenarios for IPv4/IPv6/dual stack with multiple IP assignment
Removes unpopular IPv4 alias files and invalid IPv6 alias files

Also fixes associated unit tests

LP: #1679817
LP: #1685534
LP: #1685532

f4d3ca4... by Scott Moser on 2017-05-16

Revert "tools/net-convert: fix argument order for render_network_state"

This reverts commit 64a3df16d9c63db470a3ba55d9c5cc8e05d050d7.

Patch shouldn't have been pulled. The issue was inside the netplan renderer.

8f17647... by Chad Smith on 2017-04-24

make deb: Add devscripts dependency for make deb. Cleanup packages/bddeb.

Add a simple dependency check to "make deb" target for devscripts. Rework
a bit of the logic in package/bddeb to drop superfluous STD_NAMED_PACKAGES
to avoid duplication of requirements already listed in
(test-)?requiremets.txt. All "standard" packages can be assumed to have
either python3- or python- prefix if not listed in NONSTD_NAMED_PACKAGES.
This branch also moves logic inside write_debian_folder which is unneeded
up in main.

LP: #1685935

64a3df1... by Ryan Harper on 2017-04-24

tools/net-convert: fix argument order for render_network_state

We're calling Renderer.render_network_state() with incorrect args.

% PYTHONPATH=`pwd` ./tools/net-convert.py \
   --network-data=simple-v2.yaml --kind=yaml \
   --output-kind netplan --directory ./target

Traceback (most recent call last):
  File "./tools/net-convert.py", line 82, in <module>
    main()
  File "./tools/net-convert.py", line 78, in main
    r.render_network_state(ns, target=args.directory)
TypeError: render_network_state() got multiple values for argument 'target'

The method signature requires passing <target dir>, <network_state>.
This patch fixes the call order.

LP: #1685944

9a17861... by Lars Kellogg-Stedman on 2017-05-12

openstack: fix log message copy/paste typo in _get_url_settings

There was a copy/paste error in _get_url_settings such that the error
message would complain about max wait when in fact it was talking
about retries.

6edf0c7... by Joshua Powers on 2017-04-27

unittests: fix unittests run on centos

Apt related tests were broken when running on centos becasue apt is not
available. This fixes the unit test, with a small re-work of apt_configure.

Also in 'tox -e centos6' only run nose on tests/unittests as tests/
also contain integration tests that should not be run.

4bcc947... by Scott Moser on 2017-05-16

Improve detection of snappy to include os-release and kernel cmdline.

Recent core snap images (edge channel revision 1886) do not contain the
previously known files used to detect that a system is ubuntu core.

The changes here are to look in 2 additional locations to determine
if a system is snappy.

LP: #1689944

9d43748... by Julien Castets on 2017-05-16

Add address to config entry generated by _klibc_to_config_entry.

If /run/net-<name>.cfg contains an IPV4ADDR or an IPV6ADDR, the config
file generated by _klibc_to_config_entry now contains the "address".

LP: #1691135

dd03bb4... by Chad Smith on 2017-05-10

sysconfig: Raise ValueError when multiple default gateways are present.

Fixed setting Route.has_set_default_ipv6 or *_ipv4 to track whether a
route already has a default gateway defined. The code was setting
Route.has_set_default which wasn't checked when raising "duplicate
gateway" ValueErrors. Added unit tests to exercise this expected raised
ValueError. Also moved is_ipv6 = subnet.get('ipv6') logic out of a for
loop because we don't need to recalculate the same value every route
iteration.

LP: #1687485

0a71d5a... by Hongjiang Zhang on 2017-01-13

FreeBSD: improvements and fixes for use on Azure

This patch targets to make FreeBSD 10.3 or 11 work on Azure. The
modifications abide by the rule of:
  * making as less modification as possible
  * delegate to the distro or datasource where possible.

The main modifications are:
 1. network configuration improvements, and movement into distro path.
 2. Fix setting of password.
    Password setting through "pw" can only work through pipe.
 3. Add 'root:wheel' to syslog_fix_perms field.
 4. Support resizing default file system (ufs)
 5. copy cloud.cfg for freebsd to /etc/cloud/cloud.cfg rather than
    /usr/local/etc/cloud/cloud.cfg.
 6. Azure specific changes:
    a. When reading the azure endpoint, search in a different path
       and read a different option name (option-245 vs. unknown-245).
        so, the lease file path should be generated according to platform.
    b. adjust the handling of ephemeral mounts for ufs filesystem and
       for finding the ephemeral device.
    c. fix mounting of cdrom

LP: #1636345