1. devstack
  2. Commit 1147300b9c572a19cf4c70ad3ba1fab7ccb965cc
Browse code

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

Ian Wienand authored on 2020/04/30 09:09:47
Showing 5 changed files
files/debs/general
History View file @ 1147300
... ... 
@@ -1,7 +1,6 @@
1 1 
 apache2
2 2 
 apache2-dev
3 3 
 bc
4 
-bridge-utils
5 4 
 bsdmainutils
6 5 
 curl
7 6 
 default-jre-headless  # NOPRIME
files/rpms-suse/general
History View file @ 1147300
... ... 
@@ -1,7 +1,6 @@
1 1 
 apache2
2 2 
 apache2-devel
3 3 
 bc
4 
-bridge-utils
5 4 
 ca-certificates-mozilla
6 5 
 curl
7 6 
 gcc
files/rpms/general
History View file @ 1147300
... ... 
@@ -1,5 +1,4 @@
1 1 
 bc
2 
-bridge-utils
3 2 
 curl
4 3 
 dbus
5 4 
 gcc
lib/neutron_plugins/linuxbridge_agent
History View file @ 1147300
... ... 
@@ -38,7 +38,7 @@ function neutron_plugin_create_nova_conf {
38 38 
 }
39 39
40 40 
 function neutron_plugin_install_agent_packages {
41 
-    install_package bridge-utils
41 
+    :
42 42 
 }
43 43
44 44 
 function neutron_plugin_configure_dhcp_agent {
tools/worlddump.py
History View file @ 1147300
... ... 
@@ -166,8 +166,6 @@ def network_dump():
166 166 
     _header("Network Dump")
167 167
168 168 
     _dump_cmd("bridge link")
169 
-    if _find_cmd("brctl"):
170 
-        _dump_cmd("brctl show")
171 169 
     _dump_cmd("ip link show type bridge")
172 170 
     ip_cmds = ["neigh", "addr", "link", "route"]
173 171 
     for cmd in ip_cmds + ['netns']: