From 0d9ec2b758db13f75b4f9860ad0f92d7c801783b Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Tue, 2 Jun 2020 16:55:50 +0200 Subject: [PATCH] Fix Traceback when running neutron-ipset-cleanup tool Some of the tools dependencies expect the AGENT group to be present in the configuration, and at present it is not initialized, this patch addresses that. Change-Id: I1a50e77749aaecc3966c9d238f91a1968ed454ef Signed-off-by: Frode Nordahl Closes-Bug: #1881771 (cherry picked from commit d57735ae0f01a4c0ae8c81dbdda62e07314face1) --- neutron/cmd/ipset_cleanup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neutron/cmd/ipset_cleanup.py b/neutron/cmd/ipset_cleanup.py index c6bd40de6a4..9fecf73b586 100644 --- a/neutron/cmd/ipset_cleanup.py +++ b/neutron/cmd/ipset_cleanup.py @@ -19,6 +19,7 @@ from oslo_log import log as logging from neutron.agent.linux import utils from neutron.common import config from neutron.conf.agent import cmd as command +from neutron.conf.agent import common as agent_config LOG = logging.getLogger(__name__) @@ -31,6 +32,7 @@ def setup_conf(): from the main config that do not apply during clean-up. """ conf = cfg.CONF + agent_config.register_root_helper(conf=conf) command.register_cmd_opts(command.ip_opts, conf) return conf