Merge lp:~soren/nova/dnsmasq-leasesfile-init into lp:~hudson-openstack/nova/trunk
Proposed by
Soren Hansen
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Devin Carlen | ||||
Approved revision: | 764 | ||||
Merged at revision: | 797 | ||||
Proposed branch: | lp:~soren/nova/dnsmasq-leasesfile-init | ||||
Merge into: | lp:~hudson-openstack/nova/trunk | ||||
Diff against target: |
122 lines (+57/-3) 3 files modified
bin/nova-dhcpbridge (+1/-1) nova/network/linux_net.py (+30/-2) nova/tests/test_network.py (+26/-0) |
||||
To merge this branch: | bzr merge lp:~soren/nova/dnsmasq-leasesfile-init | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Devin Carlen (community) | Approve | ||
Jay Pipes (community) | Approve | ||
Rick Harris (community) | Approve | ||
Josh Kearney (community) | Approve | ||
Review via email: mp+52421@code.launchpad.net |
Commit message
Make nova-dhcpbridge output lease information in dnsmasq's leasesfile format.
Description of the change
The output from nova-dhcpbridge has been wrong all along, but recently it caused dnsmasq to segfault. It's supposed to be in the format of dnsmasq's leases file, but it's currently in the format of dhcp-hosts.
To post a comment you must log in.
Looks great!