lp://staging/~raharper/cloud-init/trunk.smartos-sdc-nics-fix

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~cloud-init-dev/cloud-init/trunk

Server Team CI bot: Approve (continuous-integration) on 2016-07-20

Scott Moser: Pending requested 2016-06-17

Diff: 246 lines (+187/-12)

2 files modified

cloudinit/sources/DataSourceSmartOS.py (+24/-10)
tests/unittests/test_datasource/test_smartos.py (+163/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1243. By Ryan Harper on 2016-06-17

smartos: update sdc:nics json conversion to network config

Update sdc:nics json conversion to network yaml.
 - 'primary' key is a boolean, when true, the 'gateways' key is to be used
 - a nic may not include a 'gateways' key
 - 'ips' list may include 'dhcp'
 - values in 'ips' are in CIDR notation, drop/ignore netmask values

Add additional test-cases for coverage.

1242. By Scott Moser on 2016-06-16

support network rendering to sysconfig (for centos and RHEL)

This intends to add support for rendering of network data under sysconfig
distributions (centos and rhel). The end result will be support for
network configuration via ConfigDrive or NoCloud on these OS.

1241. By Scott Moser on 2016-06-16

DataSourceNoCloud: fix stack trace on reboot, default to dsmode=net

On reboot (loading module from obj.pkl) we would hit a AttributeError
when trying to access cmdline_id.
Addtionally, dsmode was inadvertantly defaulting to local for
DataSourceNoCloud.

1240. By Scott Moser on 2016-06-16

fix usage of OSError.message that will not work in python3

python3's OSError does not have a .message attribute.

1239. By Scott Moser on 2016-06-16

fix some errors reported by pylint

pylint --errors-only found several errors. Some of the changes
here represent real errors, others just code that pylint did
not like.

1238. By Scott Moser on 2016-06-16

move 'main' into cloudinit/cmd/ for easier testing

This moves bin/cloud-init's content into cloudinit/cmd/main.py,
and then fixes the pep8/flake8 issues with that.

The end result is easier testing of main.

1237. By Dan Watkins on 2016-06-15

Re-apply "Remove trailing dot from GCE metadata URL (LP: #1581200) [Phil Roche]"

This commit includes the content of that commit, plus a fix for the tests
(provided by Phil).

1236. By Scott Moser on 2016-06-14

fix pep8 failure introduced in recent commit.

The commit 1232 (Refactor a large part of the networking code) broke pep8.

1235. By Scott Moser on 2016-06-14

[Revert] Remove trailing dot from GCE metadata URL

This change broke tox tests.

1234. By Dan Watkins on 2016-06-13

Remove trailing dot from GCE metadata URL (LP: #1581200) [Phil Roche]