lp:~bbaude/cloud-init/azure_dhcp

Branch merges

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

cloud-init commiters: Pending requested 2016-06-29

Diff: 648 lines (+291/-57)

12 files modified

cloudinit/atomic_helper.py (+25/-0)
cloudinit/cmd/main.py (+23/-18)
cloudinit/dhclient_hook.py (+50/-0)
cloudinit/sources/DataSourceAzure.py (+10/-5)
cloudinit/sources/helpers/azure.py (+88/-13)
config/cloud.cfg (+6/-0)
doc/sources/azure/README.rst (+28/-4)
setup.py (+2/-0)
tests/unittests/test_datasource/test_azure_helper.py (+27/-17)
tools/hook-dhclient (+9/-0)
tools/hook-network-manager (+9/-0)
tools/hook-rhel.sh (+14/-0)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1261. By Scott Moser on 2016-08-05

re-add atomic_helper

1260. By Scott Moser on 2016-08-05

do not leak a filehandle and re-format some code .

1259. By Scott Moser on 2016-08-05

fix flake 8 . rename atonic_write_json to atomic_helper

1258. By Brent Baude on 2016-08-05

Updates from testing

1257. By Brent Baude on 2016-08-04

Adding in review comments from smoser; reworked the logic around
managing the hook files as they are written. We now pass in the
"action" (up/down) and the interface name (eth0/etc) to the
cloud-init dhclient_hook function so we can manage files
on an independant basis.

If the action is down, we delete the hook file. Else we write
(or overwrite) it using the atomic_write_json function which
now lives in its own file.

1256. By Brent Baude on 2016-08-04

pep8 cleanup for various minor nits.

1255. By Brent Baude on 2016-08-04

Removing prior attempts for python version detection from setup.py

1254. By Brent Baude on 2016-08-04

Rather than having the python executable for obtaining and storing the
dhclient information as its own executable, it is integrated into
cloud-init as a sub-command 'dhclient_hook'.

1253. By Brent Baude on 2016-08-02

Set python binary (2 vs 3) during install phase. Also, removed
use of entry_point and hook scripts now use -m instead.

1252. By Brent Baude on 2016-08-02

Updated with comments from smoser. Changed names of the
hook scripts in tools/.