x
/
vmware-nsx
Code Issues Proposed changes

Merge "[Admin utils] Also include fwaas.conf in default config files"

This commit is contained in:
Zuul 2021-11-19 14:45:59 +00:00 committed by Gerrit Code Review
parent 5d96c1dac7 8d0b0dc208
commit a05e4ebfd6
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vmware_nsx/shell/admin/plugins/common/constants.py
View File

@ -14,6 +14,7 @@
# Default conf file locations
NEUTRON_CONF = '/etc/neutron/neutron.conf'
FWAAS_CONF = '/etc/neutron/fwaas.conf'
NSX_INI = '/etc/neutron/plugins/vmware/nsx.ini'
# NSX Plugin Constants

8
vmware_nsx/shell/nsxadmin.py
View File

@ -23,6 +23,7 @@ delete-security-groups, nsx neutron nsxv3 can be options
TODO: Autocomplete command line args
"""
from os import path
import sys
from neutron.common import config as neutron_config
@ -59,12 +60,15 @@ def _init_cfg():
# Make sure the default config files are used if not specified in args
default_config_files = [constants.NEUTRON_CONF,
constants.NSX_INI]
constants.NSX_INI,
constants.FWAAS_CONF]
config_args = sys.argv[1:]
if '--config-file' not in config_args:
# Add default config files
for file in default_config_files:
config_args.extend(['--config-file', file])
if path.exists(file):
config_args.extend(['--config-file', file])
# Init the CONF and neutron config (Used by the core plugin)
neutron_config.init(args=config_args)