openstack
/
neutron
Code Issues Proposed changes

Merge "Add common neutron config options to status CLI tool"

This commit is contained in:
Zuul 2019-02-19 01:29:12 +00:00 committed by Gerrit Code Review
parent f6c6be78ee ade5d52241
commit fd8bab2840
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
neutron/cmd/status.py
View File

@ -17,6 +17,8 @@ from oslo_config import cfg
from oslo_log import log as logging
from oslo_upgradecheck import upgradecheck
from neutron.conf import common as neutron_conf_base
CHECKS_ENTRYPOINTS = 'neutron.status.upgrade.checks'
LOG = logging.getLogger(__name__)
@ -40,6 +42,17 @@ def load_checks():
return tuple(checks)
def setup_conf(conf=cfg.CONF):
"""Setup the cfg for the status check utility.
Use separate setup_conf for the utility because there are many options
from the main config that do not apply during checks.
"""
neutron_conf_base.register_core_common_config_opts(conf)
return conf
class Checker(upgradecheck.UpgradeCommands):
"""Various upgrade checks should be added as separate methods in this class
@ -62,5 +75,6 @@ class Checker(upgradecheck.UpgradeCommands):
def main():
conf = setup_conf()
return upgradecheck.main(
cfg.CONF, project='neutron', upgrade_command=Checker())
conf, project='neutron', upgrade_command=Checker())