~chad.smith/cloud-init:aws-local-dhcp

Branch merges

Propose for merging

Merged into cloud-init:master at revision d5f855dd96ccbea77f61b0515b574ad2c43d116d

Andrew Jorgensen (community): Approve on 2017-08-07

Server Team CI bot: Approve (continuous-integration) on 2017-08-07

Scott Moser: Approve on 2017-08-04

Diff: 901 lines (+511/-91)

11 files modified

cloudinit/net/__init__.py (+20/-33)
cloudinit/net/dhcp.py (+119/-0)
cloudinit/net/tests/test_dhcp.py (+144/-0)
cloudinit/net/tests/test_init.py (+1/-1)
cloudinit/sources/DataSourceAliYun.py (+6/-3)
cloudinit/sources/DataSourceEc2.py (+99/-22)
tests/unittests/helpers.py (+1/-1)
tests/unittests/test_datasource/test_aliyun.py (+6/-5)
tests/unittests/test_datasource/test_common.py (+1/-0)
tests/unittests/test_datasource/test_ec2.py (+112/-24)
tox.ini (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

d462d39... by Chad Smith on 2017-08-07

use util.log_time instead of making direct calls to time.time for crawl_metadata

b666d7e... by Chad Smith on 2017-08-04

log typo prefered -> prefered

84bf898... by Chad Smith on 2017-08-04

additional log message when we discover an extended/preferred metadata version

813f998... by Chad Smith on 2017-08-04

response codes are ints

22f4f6f... by Chad Smith on 2017-08-04

construct proper versioned url in get_metadata_api_version

3bdde87... by Chad Smith on 2017-08-04

flakes

4eb786a... by Chad Smith on 2017-08-04

add a min_metadata_version versus extended_metadata_version class attrs and a get_metadadata_version method on Ec2 and AliYun datasources

da6658b... by Chad Smith on 2017-08-04

move dhclient command checks into maybe_perform_dhcp_discovery

87d53b4... by Chad Smith on 2017-08-04

fix flakes

c61035a... by Chad Smith on 2017-08-04

update aliyun datasource and unit tests for supported_metadata_versions