openstack
/
devstack
Code Issues Proposed changes

Merge "Clean up compile_ovn function's parameters"

This commit is contained in:
Zuul 2022-01-13 17:43:52 +00:00 committed by Gerrit Code Review
parent 6d55b2a439 5888947539
commit b6656b7b38
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/neutron_plugins/ovn_agent
View File

@ -292,16 +292,13 @@ function _disable_libvirt_apparmor {
# compile_ovn() - Compile OVN from source and load needed modules # compile_ovn() - Compile OVN from source and load needed modules
# Accepts three parameters: # Accepts three parameters:
# - first optional is False by default and means that # - first optional parameter defines prefix for
# modules are built and installed.
# - second optional parameter defines prefix for
# ovn compilation # ovn compilation
# - third optional parameter defines localstatedir for # - second optional parameter defines localstatedir for
# ovn single machine runtime # ovn single machine runtime
function compile_ovn { function compile_ovn {
local build_modules=${1:-False} local prefix=$1
local prefix=$2 local localstatedir=$2
local localstatedir=$3
if [ -n "$prefix" ]; then if [ -n "$prefix" ]; then
prefix="--prefix=$prefix" prefix="--prefix=$prefix"
@ -374,7 +371,7 @@ function install_ovn {
compile_ovs $OVN_BUILD_MODULES compile_ovs $OVN_BUILD_MODULES
if use_new_ovn_repository; then if use_new_ovn_repository; then
compile_ovn $OVN_BUILD_MODULES compile_ovn
fi fi
sudo mkdir -p $OVS_PREFIX/var/log/openvswitch sudo mkdir -p $OVS_PREFIX/var/log/openvswitch