Browse Source

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

tags/14.3.1
Zuul 1 month ago
committed by Gerrit Code Review
parent
commit
4ceee76477
1 changed files with 2 additions and 0 deletions
  1. +2
    -0
      neutron/cmd/ipset_cleanup.py

+ 2
- 0
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.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



Loading…
Cancel
Save