cloud-init

Merge lp://staging/~wido/cloud-init/cloudstack-dhcp into lp://staging/~cloud-init-dev/cloud-init/trunk

cloudstack-dhcp
Merge into trunk

Proposed by Dan Watkins on 2016-04-29

Status:	Merged
Merged at revision:	1213
Proposed branch:	lp://staging/~wido/cloud-init/cloudstack-dhcp
Merge into:	lp://staging/~cloud-init-dev/cloud-init/trunk
Diff against target:	13 lines (+2/-1) 1 file modified cloudinit/sources/DataSourceCloudStack.py (+2/-1)
To merge this branch:	bzr merge lp://staging/~wido/cloud-init/cloudstack-dhcp
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Wido den Hollander (community)		Approve on 2016-04-29
cloud-init Commiters	2016-04-29	Pending
Review via email: mp+293379@code.staging.launchpad.net

Revision history for this message

Wido den Hollander (wido) wrote on 2016-04-29:

I run this patch in production on our CloudStack environment which also has IPv6 with DHCPv6 enabled. Previous to this patch cloud-init would fail and with this patch it works.

review: Approve

Revision history for this message

Scott Moser (smoser) wrote on 2016-04-29:

i really hate \ at the end of the line.
would have preferred

if (file_name.startswith("dhclient.") and
(file_name.endswith(".lease") or file_name.endswith(".leases"))):

oh well.