openstack
/
nova
Code Issues Proposed changes

fix bug #980452 set net.ipv4.ip_forward=1 on network 

Change-Id: I03c569252f896330cc6396267e00b626e9232fb7
This commit is contained in:
Peng Yong 2012-03-19 15:11:24 +08:00 committed by Vishvananda Ishaya
parent ca4aee67e3
commit 1335352df3
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/network/linux_net.py
View File

@ -524,6 +524,8 @@ def initialize_gateway_device(dev, network_ref):
if not network_ref:
return
_execute('sysctl', '-w', 'net.ipv4.ip_forward=1', run_as_root=True)
# NOTE(vish): The ip for dnsmasq has to be the first address on the
# bridge for it to respond to reqests properly
full_ip = '%s/%s' % (network_ref['dhcp_server'],

3
nova/rootwrap/network.py
View File

@ -87,4 +87,7 @@ filterlist = [
# nova/network/linux_net.py: 'ovs-ofctl', ....
filters.CommandFilter("/usr/bin/ovs-ofctl", "root"),
# nova/network/linux_net.py: 'sysctl', ....
filters.CommandFilter("/sbin/sysctl", "root"),
]

4
nova/tests/test_linux_net.py
View File

@ -426,6 +426,7 @@ class LinuxNetworkTestCase(test.TestCase):
" inet6 dead::beef:dead:beef:dead/64 scope link\n"
" valid_lft forever preferred_lft forever\n")
expected = [
('sysctl', '-w', 'net.ipv4.ip_forward=1'),
('ip', 'addr', 'show', 'dev', 'eth0', 'scope', 'global'),
('route', '-n'),
('ip', 'addr', 'del', '192.168.0.1/24',
@ -449,6 +450,7 @@ class LinuxNetworkTestCase(test.TestCase):
" inet6 dead::beef:dead:beef:dead/64 scope link\n"
" valid_lft forever preferred_lft forever\n")
expected = [
('sysctl', '-w', 'net.ipv4.ip_forward=1'),
('ip', 'addr', 'show', 'dev', 'eth0', 'scope', 'global'),
('route', '-n'),
('route', 'del', 'default', 'gw', '192.68.0.1', 'dev', 'eth0'),
@ -473,6 +475,7 @@ class LinuxNetworkTestCase(test.TestCase):
" inet6 dead::beef:dead:beef:dead/64 scope link\n"
" valid_lft forever preferred_lft forever\n")
expected = [
('sysctl', '-w', 'net.ipv4.ip_forward=1'),
('ip', 'addr', 'show', 'dev', 'eth0', 'scope', 'global'),
('ip', '-f', 'inet6', 'addr', 'change',
'2001:db8::/64', 'dev', 'eth0'),
@ -486,6 +489,7 @@ class LinuxNetworkTestCase(test.TestCase):
" inet6 dead::beef:dead:beef:dead/64 scope link\n"
" valid_lft forever preferred_lft forever\n")
expected = [
('sysctl', '-w', 'net.ipv4.ip_forward=1'),
('ip', 'addr', 'show', 'dev', 'eth0', 'scope', 'global'),
('route', '-n'),
('ip', 'addr', 'add', '192.168.1.1/24',