Skip to content

Commit da18895

Browse files
author
Brian Haley
committed
Fix brctl calls
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
1 parent b461a09 commit da18895

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

lib/neutron_plugins/linuxbridge_agent

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function neutron_plugin_configure_dhcp_agent {
4848

4949
function neutron_plugin_configure_l3_agent {
5050
local conf_file=$1
51-
sudo brctl addbr $PUBLIC_BRIDGE
51+
sudo ip link add $PUBLIC_BRIDGE type bridge
5252
set_mtu $PUBLIC_BRIDGE $PUBLIC_BRIDGE_MTU
5353
}
5454

tools/worlddump.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,8 @@ def network_dump():
165165
_header("Network Dump")
166166

167167
_dump_cmd("bridge link")
168-
_dump_cmd("brctl show")
168+
if _find_cmd("brctl"):
169+
_dump_cmd("brctl show")
169170
_dump_cmd("ip link show type bridge")
170171
ip_cmds = ["neigh", "addr", "link", "route"]
171172
for cmd in ip_cmds + ['netns']:

0 commit comments

Comments
 (0)