From 3b509399e3c4c95f0cc6cf1b0e2fc80fe315b9ba Mon Sep 17 00:00:00 2001
From: Goutham Pacha Ravi <gouthampravi@gmail.com>
Date: Mon, 4 May 2020 14:48:52 -0700
Subject: [PATCH] [ci][devstack] Install bridge-utils for Container driver
Devstack no longer installs this package after [1]. The driver
needs to replace the use of brctl to completely remove this
package from our test environments.
[1] https://review.opendev.org/724443/
Partial-Bug: #1876820
Change-Id: Id6094827341bf6ef8856cd4e7af11b36e9afb560
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
---
devstack/plugin.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 7036881a67..7c377c6ee1 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -762,6 +762,9 @@ function install_manila {
fi
check_nfs_kernel_service_state_ubuntu
elif [ "$SHARE_DRIVER" == $MANILA_CONTAINER_DRIVER ]; then
+ # Remove workaround for https://launchpad.net/bugs/1876820 when
+ # container driver stops using "brctl"
+ install_package bridge-utils
if is_ubuntu; then
echo "Installing docker...."
install_docker_ubuntu