Admin util: use correct config options

TrivialFix

stack@controller:/opt/stack/logs$ nsxadmin
Traceback (most recent call last):
  File "/usr/local/bin/nsxadmin", line 10, in <module>
    sys.exit(main())
  File "/opt/stack/vmware-nsx/vmware_nsx/shell/nsxadmin.py", line 102, in main
    _init_cfg()
  File "/opt/stack/vmware-nsx/vmware_nsx/shell/nsxadmin.py", line 58, in _init_cfg
    cfg.CONF.unregister_opts(neutron_config.core_cli_opts)
AttributeError: 'module' object has no attribute 'core_cli_opts'
stack@controller:/opt/stack/logs$

Change-Id: Ia620751195e66cc0fd30c8cc6a6d1fe64dc915d3
This commit is contained in:
Gary Kotton 2016-08-04 06:58:51 -07:00
parent 4588ff4722
commit 87827f9608

View File

@ -30,6 +30,7 @@ import sys
from neutron.callbacks import registry
from neutron.common import config as neutron_config
from neutron.conf import common as neutron_common_config
from vmware_nsx._i18n import _LE, _LI
from vmware_nsx.common import config # noqa
@ -55,7 +56,7 @@ def _init_cfg():
# so we unregister these options
cfg.CONF.unregister_opts(_options.common_cli_opts)
cfg.CONF.unregister_opts(_options.logging_cli_opts)
cfg.CONF.unregister_opts(neutron_config.core_cli_opts)
cfg.CONF.unregister_opts(neutron_common_config.core_cli_opts)
# Init the neutron config
neutron_config.init(args=['--config-file', constants.NEUTRON_CONF,