openstack
/
devstack
Code Issues Proposed changes

Merge "Fix brctl calls"

This commit is contained in:
Zuul 2019-11-16 16:49:02 +00:00 committed by Gerrit Code Review
parent 0610413f05 da18895162
commit b0f87b2866
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/neutron_plugins/linuxbridge_agent
View File

@ -48,7 +48,7 @@ function neutron_plugin_configure_dhcp_agent {
function neutron_plugin_configure_l3_agent { function neutron_plugin_configure_l3_agent {
local conf_file=$1 local conf_file=$1
sudo brctl addbr $PUBLIC_BRIDGE sudo ip link add $PUBLIC_BRIDGE type bridge
set_mtu $PUBLIC_BRIDGE $PUBLIC_BRIDGE_MTU set_mtu $PUBLIC_BRIDGE $PUBLIC_BRIDGE_MTU
} }

3
tools/worlddump.py
View File

@ -165,7 +165,8 @@ def network_dump():
_header("Network Dump") _header("Network Dump")
_dump_cmd("bridge link") _dump_cmd("bridge link")
_dump_cmd("brctl show") if _find_cmd("brctl"):
_dump_cmd("brctl show")
_dump_cmd("ip link show type bridge") _dump_cmd("ip link show type bridge")
ip_cmds = ["neigh", "addr", "link", "route"] ip_cmds = ["neigh", "addr", "link", "route"]
for cmd in ip_cmds + ['netns']: for cmd in ip_cmds + ['netns']: