diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2012-03-15 16:32:13 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2012-03-15 16:33:24 -0700 |
| commit | 682f612b2c35ab3c967b76c457bde80af0caec54 (patch) | |
| tree | 2f680cc624129c62f016dca4ebac754940cd6a1e | |
| parent | bb1e383ae328517593ad4757cc168bf58d951111 (diff) | |
| download | nova-682f612b2c35ab3c967b76c457bde80af0caec54.tar.gz nova-682f612b2c35ab3c967b76c457bde80af0caec54.tar.xz nova-682f612b2c35ab3c967b76c457bde80af0caec54.zip | |
Stop setting promisc on bridge
* With hairpin mode the old workaround is now broken
* Fixes bug 956474
Change-Id: Ib06baa5292ad59138041b2c641673a96263b5ff8
| -rwxr-xr-x | nova/network/linux_net.py | 6 | ||||
| -rw-r--r-- | nova/tests/test_linux_net.py | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index 8b75635fd..5a4c5cdfa 100755 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -562,12 +562,6 @@ def initialize_gateway_device(dev, network_ref): _execute('ip', '-f', 'inet6', 'addr', 'change', network_ref['cidr_v6'], 'dev', dev, run_as_root=True) - # NOTE(vish): If the public interface is the same as the - # bridge, then the bridge has to be in promiscuous - # to forward packets properly. - if(FLAGS.public_interface == dev): - _execute('ip', 'link', 'set', - 'dev', dev, 'promisc', 'on', run_as_root=True) def get_dhcp_leases(context, network_ref): diff --git a/nova/tests/test_linux_net.py b/nova/tests/test_linux_net.py index 39a5d3bed..d50bae68d 100644 --- a/nova/tests/test_linux_net.py +++ b/nova/tests/test_linux_net.py @@ -504,7 +504,6 @@ class LinuxNetworkTestCase(test.TestCase): 'brd', '192.168.0.255', 'scope', 'global', 'dev', 'eth0'), ('ip', '-f', 'inet6', 'addr', 'change', '2001:db8::/64', 'dev', 'eth0'), - ('ip', 'link', 'set', 'dev', 'eth0', 'promisc', 'on'), ] self._test_initialize_gateway(existing, expected) @@ -530,7 +529,6 @@ class LinuxNetworkTestCase(test.TestCase): ('route', 'add', 'default', 'gw', '192.68.0.1'), ('ip', '-f', 'inet6', 'addr', 'change', '2001:db8::/64', 'dev', 'eth0'), - ('ip', 'link', 'set', 'dev', 'eth0', 'promisc', 'on'), ] self._test_initialize_gateway(existing, expected, routes) @@ -546,7 +544,6 @@ class LinuxNetworkTestCase(test.TestCase): ('ip', 'addr', 'show', 'dev', 'eth0', 'scope', 'global'), ('ip', '-f', 'inet6', 'addr', 'change', '2001:db8::/64', 'dev', 'eth0'), - ('ip', 'link', 'set', 'dev', 'eth0', 'promisc', 'on'), ] self._test_initialize_gateway(existing, expected) @@ -563,6 +560,5 @@ class LinuxNetworkTestCase(test.TestCase): 'brd', '192.168.1.255', 'dev', 'eth0'), ('ip', '-f', 'inet6', 'addr', 'change', '2001:db8::/64', 'dev', 'eth0'), - ('ip', 'link', 'set', 'dev', 'eth0', 'promisc', 'on'), ] self._test_initialize_gateway(existing, expected) |