openstack
/
devstack
Code Issues Proposed changes

Remove bridge-utils/brctl usage 

This package isn't available on some distributions hasn't been
required in Neutron for several years
If679e79fa3242ee1cd8610b5525deca35b41c87e.  Remove it.

Change-Id: I7308a885c1d084efe2f0b9f542443d35966140ed
This commit is contained in:
Ian Wienand 2020-04-30 10:09:47 +10:00
parent 773fd20dd9
commit 1147300b9c
5 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files/debs/general
View File

@ -1,7 +1,6 @@
apache2 apache2
apache2-dev apache2-dev
bc bc
bridge-utils
bsdmainutils bsdmainutils
curl curl
default-jre-headless # NOPRIME default-jre-headless # NOPRIME

1
files/rpms-suse/general
View File

@ -1,7 +1,6 @@
apache2 apache2
apache2-devel apache2-devel
bc bc
bridge-utils
ca-certificates-mozilla ca-certificates-mozilla
curl curl
gcc gcc

1
files/rpms/general
View File

@ -1,5 +1,4 @@
bc bc
bridge-utils
curl curl
dbus dbus
gcc gcc

2
lib/neutron_plugins/linuxbridge_agent
View File

@ -38,7 +38,7 @@ function neutron_plugin_create_nova_conf {
} }
function neutron_plugin_install_agent_packages { function neutron_plugin_install_agent_packages {
install_package bridge-utils :
} }
function neutron_plugin_configure_dhcp_agent { function neutron_plugin_configure_dhcp_agent {

2
tools/worlddump.py
View File

@ -166,8 +166,6 @@ def network_dump():
_header("Network Dump") _header("Network Dump")
_dump_cmd("bridge link") _dump_cmd("bridge link")
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']: