commit b0f87b286645ff20ed0bdde5443ecdbe4ae0dbd0
author Zuul <zuul@review.opendev.org> Sat Nov 16 16:49:02 2019 +0000
committer Gerrit Code Review <review@openstack.org> Sat Nov 16 16:49:02 2019 +0000
tree d9ba2ae7a610434a266a3f44c121ad2ec6a04362
parent 0610413f0561eede3f44182c0896da7ff6f8cd05
parent da18895162bababea638b3f28c76cb9766e821b6

Merge "Fix brctl calls"

lib/neutron_plugins/linuxbridge_agent

diff --git a/lib/neutron_plugins/linuxbridge_agent b/lib/neutron_plugins/linuxbridge_agent
index fa3f862..1f1b0e8 100644
--- a/lib/neutron_plugins/linuxbridge_agent
+++ b/lib/neutron_plugins/linuxbridge_agent
@@ -48,7 +48,7 @@
 
 function neutron_plugin_configure_l3_agent {
     local conf_file=$1
-    sudo brctl addbr $PUBLIC_BRIDGE
+    sudo ip link add $PUBLIC_BRIDGE type bridge
     set_mtu $PUBLIC_BRIDGE $PUBLIC_BRIDGE_MTU
 }
 

tools/worlddump.py

diff --git a/tools/worlddump.py b/tools/worlddump.py
index d1453ca..d5ff5d1 100755
--- a/tools/worlddump.py
+++ b/tools/worlddump.py
@@ -165,7 +165,8 @@
     _header("Network Dump")
 
     _dump_cmd("bridge link")
-    _dump_cmd("brctl show")
+    if _find_cmd("brctl"):
+        _dump_cmd("brctl show")
     _dump_cmd("ip link show type bridge")
     ip_cmds = ["neigh", "addr", "link", "route"]
     for cmd in ip_cmds + ['netns']: