Merge "Fix brctl calls"

Zuul · openstack-gerrit · commit b0f87b286645 · 2019-11-16T16:49:02.000Z
diff --git a/lib/neutron_plugins/linuxbridge_agent b/lib/neutron_plugins/linuxbridge_agent
@@ -48,7 +48,7 @@ function neutron_plugin_configure_dhcp_agent {
 
 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
 }
 
diff --git a/tools/worlddump.py b/tools/worlddump.py
@@ -165,7 +165,8 @@ def network_dump():
     _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']:

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ function neutron_plugin_configure_dhcp_agent {`
`48`	`48`
`49`	`49`	`function neutron_plugin_configure_l3_agent {`
`50`	`50`	`local conf_file=$1`
`51`		`- sudo brctl addbr $PUBLIC_BRIDGE`
	`51`	`+ sudo ip link add $PUBLIC_BRIDGE type bridge`
`52`	`52`	`set_mtu $PUBLIC_BRIDGE $PUBLIC_BRIDGE_MTU`
`53`	`53`	`}`
`54`	`54`