Remove libvirt apparmor workaround

This is triggering bug #2065685 [1] on Ubuntu 24.04 (Noble) if podman is
installed (since that brings in the broken paast and pasta packages).
Given the workaround is nearly 10 years old [2], it should not be
necessary anymore.

[1] https://bugs.launchpad.net/ubuntu/+source/apparmor/+bug/2065685
[2] https://bugs.launchpad.net/networking-ovn/+bug/1466631

Change-Id: I525b1f30bca7093791f927ff647db7745d25df22
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Related-bug: #2065685
Related-bug: #1466631
This commit is contained in:
Stephen Finucane
2025-05-12 15:17:42 +01:00
parent ddcd052b1e
commit cbae989491

View File

@@ -300,18 +300,6 @@ function create_public_bridge {
_configure_public_network_connectivity
}
function _disable_libvirt_apparmor {
if ! sudo aa-status --enabled ; then
return 0
fi
# NOTE(arosen): This is used as a work around to allow newer versions
# of libvirt to work with ovs configured ports. See LP#1466631.
# requires the apparmor-utils
install_package apparmor-utils
# disables apparmor for libvirtd
sudo aa-complain /etc/apparmor.d/usr.sbin.libvirtd
}
# OVN compilation functions
# -------------------------
@@ -614,7 +602,6 @@ function init_ovn {
# in the ovn, ovn-nb, or ovs databases. We're going to trash them and
# create new ones on each devstack run.
_disable_libvirt_apparmor
local mkdir_cmd="mkdir -p ${OVN_DATADIR}"
if [[ "$OVN_BUILD_FROM_SOURCE" == "False" ]]; then