openstack/devstack
Code Issues Proposed changes

Merge "Remove libvirt apparmor workaround"

Browse Source
This commit is contained in:
Zuul
2025-05-13 08:56:56 +00:00
committed by Gerrit Code Review
parent 8504bc1108 cbae989491
commit c5d1a05281
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/neutron_plugins/ovn_agent
View File

@@ -300,18 +300,6 @@ function create_public_bridge {
_configure_public_network_connectivity _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 # 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 # in the ovn, ovn-nb, or ovs databases. We're going to trash them and
# create new ones on each devstack run. # create new ones on each devstack run.
_disable_libvirt_apparmor
local mkdir_cmd="mkdir -p ${OVN_DATADIR}" local mkdir_cmd="mkdir -p ${OVN_DATADIR}"
if [[ "$OVN_BUILD_FROM_SOURCE" == "False" ]]; then if [[ "$OVN_BUILD_FROM_SOURCE" == "False" ]]; then