openstack/devstack
Code Issues Proposed changes

Fix brctl calls

Browse Source 
Some distros no longer ship brctl, iproute2 should be used
in its place. The linuxbridge agent plugin script was still
using it, as was worlddump, which generates this warning on
a failure:

    Running devstack worlddump.py
    /bin/sh: 1: brctl: not found

Conditionalizing worlddump based on whether brctl is installed
to make this go away.

Change-Id: Iafbf4038bab08c261d45d117b12d4629ba32d65e
This commit is contained in:
Brian Haley 2019-10-31 14:49:23 -04:00
parent b461a092c4
commit da18895162
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']: