From 1147300b9c572a19cf4c70ad3ba1fab7ccb965cc Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Thu, 30 Apr 2020 10:09:47 +1000
Subject: [PATCH] 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
---
 files/debs/general                    | 1 -
 files/rpms-suse/general               | 1 -
 files/rpms/general                    | 1 -
 lib/neutron_plugins/linuxbridge_agent | 2 +-
 tools/worlddump.py                    | 2 --
 5 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/files/debs/general b/files/debs/general
index fe0061337a..2d8cd80473 100644
--- a/files/debs/general
+++ b/files/debs/general
@@ -1,7 +1,6 @@
 apache2
 apache2-dev
 bc
-bridge-utils
 bsdmainutils
 curl
 default-jre-headless  # NOPRIME
diff --git a/files/rpms-suse/general b/files/rpms-suse/general
index b870d72149..0af2b5b169 100644
--- a/files/rpms-suse/general
+++ b/files/rpms-suse/general
@@ -1,7 +1,6 @@
 apache2
 apache2-devel
 bc
-bridge-utils
 ca-certificates-mozilla
 curl
 gcc
diff --git a/files/rpms/general b/files/rpms/general
index ff77ce05af..303510cbd9 100644
--- a/files/rpms/general
+++ b/files/rpms/general
@@ -1,5 +1,4 @@
 bc
-bridge-utils
 curl
 dbus
 gcc
diff --git a/lib/neutron_plugins/linuxbridge_agent b/lib/neutron_plugins/linuxbridge_agent
index 1f1b0e8e52..bdeaf0f3c6 100644
--- a/lib/neutron_plugins/linuxbridge_agent
+++ b/lib/neutron_plugins/linuxbridge_agent
@@ -38,7 +38,7 @@ function neutron_plugin_create_nova_conf {
 }
 
 function neutron_plugin_install_agent_packages {
-    install_package bridge-utils
+    :
 }
 
 function neutron_plugin_configure_dhcp_agent {
diff --git a/tools/worlddump.py b/tools/worlddump.py
index b21ed0c861..0a4df52337 100755
--- a/tools/worlddump.py
+++ b/tools/worlddump.py
@@ -166,8 +166,6 @@ def network_dump():
     _header("Network Dump")
 
     _dump_cmd("bridge link")
-    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']: