Merge lp://qastaging/~vishvananda/nova/fix-dhcp into lp://qastaging/~hudson-openstack/nova/trunk
Proposed by
Vish Ishaya
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Dan Prince | ||||||||
| Approved revision: | 1545 | ||||||||
| Merged at revision: | 1607 | ||||||||
| Proposed branch: | lp://qastaging/~vishvananda/nova/fix-dhcp | ||||||||
| Merge into: | lp://qastaging/~hudson-openstack/nova/trunk | ||||||||
| Diff against target: |
127 lines (+93/-16) 2 files modified
nova/network/linux_net.py (+24/-16) nova/tests/test_linux_net.py (+69/-0) |
||||||||
| To merge this branch: | bzr merge lp://qastaging/~vishvananda/nova/fix-dhcp | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Dan Prince (community) | Approve | ||
| Soren Hansen (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Makes sure ips are moved on the bridge for nodes running dnsmasq so that the gateway ip is always first.
To post a comment you must log in.
Revision history for this message
| Soren Hansen (soren) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
lgtm
I do wonder, though, if this is a bug in dnsmasq of if it's by design? Have we talked to dnsmasq upstream at all? According to man ip(8), the addresses are not discriminated, so the order shouldn't matter, AFAICS.