Change to use iproute2 instead of brctl

brctl is being deprecated in some Linux distros, so
change container driver to start using iproute2 commands.

Closes-bug: #1877410
Change-Id: If679e79fa3242ee1cd8610b5525deca35b41c87e
This commit is contained in:
Felipe Rodrigues 2022-08-04 23:01:50 -03:00
parent a3b48cc5c1
commit 7ecc990686
2 changed files with 1 additions and 4 deletions

View File

@ -781,9 +781,6 @@ 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

View File

@ -251,7 +251,7 @@ class ContainerShareDriver(driver.ShareDriver, driver.ExecuteMixin):
}
LOG.debug("Container %(id)s veth is %(veth)s.", msg_helper)
LOG.debug("Removing %(veth)s from %(lb)s.", msg_helper)
self._execute("brctl", "delif", host_bridge, host_veth,
self._execute("ip", "link", "set", "dev", host_veth, "nomaster",
run_as_root=True)
LOG.debug("Plugging %(veth)s into %(ovsb)s.", msg_helper)