From de78aaec9d2f477fab4fa3ac1061a050a515bdaf Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Wed, 14 Apr 2021 16:37:08 +0000 Subject: [PATCH] Initialize privsep library in Neutron commands Since the migration to privsep, some Neutron commands execute methods under a privsep context. The privsep library must be initialized first. Change-Id: Icd69bca23d781bace580b3937bc8bd25b586e852 Closes-Bug: #1923870 (cherry picked from commit 088f1298f26ac04da0ebea2a905378690677ff70) --- neutron/cmd/ipset_cleanup.py | 1 + neutron/cmd/sanity_check.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/neutron/cmd/ipset_cleanup.py b/neutron/cmd/ipset_cleanup.py index 078bdd17fbf..7f09b8d9c57 100644 --- a/neutron/cmd/ipset_cleanup.py +++ b/neutron/cmd/ipset_cleanup.py @@ -33,6 +33,7 @@ def setup_conf(): """ conf = cfg.CONF agent_config.register_root_helper(conf=conf) + agent_config.setup_privsep() command.register_cmd_opts(command.ip_opts, conf) return conf diff --git a/neutron/cmd/sanity_check.py b/neutron/cmd/sanity_check.py index afcb5cf6a93..74fa6e5c692 100644 --- a/neutron/cmd/sanity_check.py +++ b/neutron/cmd/sanity_check.py @@ -22,6 +22,7 @@ from neutron._i18n import _ from neutron.agent import dhcp_agent from neutron.cmd.sanity import checks from neutron.common import config +from neutron.conf.agent import common as agent_config from neutron.conf.agent import securitygroups_rpc from neutron.conf.db import l3_hamode_db from neutron.conf.plugins.ml2 import config as ml2_conf @@ -419,6 +420,7 @@ def main(): cfg.CONF.set_override('use_stderr', True) config.setup_logging() config.init(sys.argv[1:], default_config_files=[]) + agent_config.setup_privsep() if cfg.CONF.config_file: enable_tests_from_config()