x/vmware-nsx
Code Issues Proposed changes

Merge "Fix custom conf files referencing"

Browse Source
This commit is contained in:
Jenkins 2015-12-07 03:19:43 +00:00 committed by Gerrit Code Review
commit e514c5e530
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/python_nsxadmin/admin/plugins/common/constants.py
View File

@ -12,6 +12,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# Default conf file locations
NEUTRON_CONF = '/etc/neutron/neutron.conf'
NSX_INI = '/etc/neutron/plugins/vmware/nsx.ini'
# NSX Plugin Constants # NSX Plugin Constants
NSXV3_PLUGIN = 'vmware_nsx.plugin.NsxV3Plugin' NSXV3_PLUGIN = 'vmware_nsx.plugin.NsxV3Plugin'
NSXV_PLUGIN = 'vmware_nsx.plugin.NsxVPlugin' NSXV_PLUGIN = 'vmware_nsx.plugin.NsxVPlugin'

13
tools/python_nsxadmin/admin/shell.py
View File

@ -116,13 +116,7 @@ def _get_resources():
modules) modules)
cli_opts = [cfg.StrOpt('neutron-conf', cli_opts = [cfg.StrOpt('fmt',
default='/etc/neutron/neutron.conf',
help='Neutron configuration file'),
cfg.StrOpt('nsx-conf',
default='/etc/neutron/plugins/vmware/nsx.ini',
help='NSX configuration file'),
cfg.StrOpt('fmt',
short='f', short='f',
default='psql', default='psql',
choices=['psql', 'json'], choices=['psql', 'json'],
@ -171,8 +165,8 @@ def _init_cfg():
prog='Admin Utility', prog='Admin Utility',
version=version.__version__, version=version.__version__,
usage='nsxadmin -r <resources> -o <operation>', usage='nsxadmin -r <resources> -o <operation>',
default_config_files=[cfg.CONF.neutron_conf, default_config_files=[constants.NEUTRON_CONF,
cfg.CONF.nsx_conf]) constants.NSX_INI])
def _validate_resource_choice(resource, nsx_plugin): def _validate_resource_choice(resource, nsx_plugin):
@ -207,7 +201,6 @@ def _validate_op_choice(choice, nsx_plugin):
def main(argv=sys.argv[1:]): def main(argv=sys.argv[1:]):
_init_cfg() _init_cfg()
_init_resource_plugin() _init_resource_plugin()
nsx_plugin_in_use = _get_plugin() nsx_plugin_in_use = _get_plugin()
LOG.info(_LI('NSX Plugin in use: %s'), nsx_plugin_in_use) LOG.info(_LI('NSX Plugin in use: %s'), nsx_plugin_in_use)