Merge lp:~vishvananda/nova/new-dnsmasq into lp:~hudson-openstack/nova/milestone-proposed

Proposed by Vish Ishaya
Status: Merged
Approved by: Vish Ishaya
Approved revision: 1542
Merged at revision: 1184
Proposed branch: lp:~vishvananda/nova/new-dnsmasq
Merge into: lp:~hudson-openstack/nova/milestone-proposed
Diff against target: 11 lines (+0/-1)
1 file modified
nova/network/linux_net.py (+0/-1)
To merge this branch: bzr merge lp:~vishvananda/nova/new-dnsmasq
Reviewer Review Type Date Requested Status
OpenStack release team Pending
Review via email: mp+76096@code.launchpad.net

Description of the change

Fix the issue with the new dnsmasq where it tries and fails to bind to ipv6 addresses.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/network/linux_net.py'
2--- nova/network/linux_net.py 2011-09-07 20:10:05 +0000
3+++ nova/network/linux_net.py 2011-09-19 20:13:55 +0000
4@@ -584,7 +584,6 @@
5 'dnsmasq',
6 '--strict-order',
7 '--bind-interfaces',
8- '--interface=%s' % dev,
9 '--conf-file=%s' % FLAGS.dnsmasq_config_file,
10 '--domain=%s' % FLAGS.dhcp_domain,
11 '--pid-file=%s' % _dhcp_file(dev, 'pid'),

Subscribers

People subscribed via source and target branches