openstack
/
neutron
Code Issues Proposed changes

Merge "Fix Traceback when running neutron-ipset-cleanup tool" into stable/ussuri

This commit is contained in:
Zuul 2020-06-24 06:00:48 +00:00 committed by Gerrit Code Review
parent 1ff892d70f 98010a2f6a
commit 63707ac495
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/cmd/ipset_cleanup.py
View File

@ -19,6 +19,7 @@ from oslo_log import log as logging
from neutron.agent.linux import utils from neutron.agent.linux import utils
from neutron.common import config from neutron.common import config
from neutron.conf.agent import cmd as command from neutron.conf.agent import cmd as command
from neutron.conf.agent import common as agent_config
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -31,6 +32,7 @@ def setup_conf():
from the main config that do not apply during clean-up. from the main config that do not apply during clean-up.
""" """
conf = cfg.CONF conf = cfg.CONF
agent_config.register_root_helper(conf=conf)
command.register_cmd_opts(command.ip_opts, conf) command.register_cmd_opts(command.ip_opts, conf)
return conf return conf