x/vmware-nsx
Code Issues Proposed changes

Merge "Make help texts more descriptive in Metaplugin"

Browse Source
This commit is contained in:
Jenkins 2014-04-23 03:23:51 +00:00 committed by Gerrit Code Review
commit 933256751e
2 changed files with 64 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
etc/neutron/plugins/metaplugin/metaplugin.ini
View File

@ -1,21 +1,31 @@
# Config file for Metaplugin
[meta] [meta]
## This is list of flavor:neutron_plugins # Comma separated list of flavor:neutron_plugin for plugins to load.
# extension method is used in the order of this list # Extension method is searched in the list order and the first one is used.
# If you use a router service plugin, set 'l3_plugin_list' blank. plugin_list = 'ml2:neutron.plugins.ml2.plugin.Ml2Plugin,nvp:neutron.plugins.vmware.plugin.NsxPluginV2'
# If 'l3_plugin_list' is not blank, must not specify a router service
# plugin in 'service_plugins' of neutron.conf.
plugin_list= 'openvswitch:neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2,linuxbridge:neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2'
l3_plugin_list= 'openvswitch:neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2,linuxbridge:neutron.plugins.linuxbridge.lb_neutron_plugin.LinuxBridgePluginV2'
# Default value of flavor # Comma separated list of flavor:neutron_plugin for L3 service plugins
default_flavor = 'openvswitch' # to load.
default_l3_flavor = 'openvswitch' # This is intended for specifying L2 plugins which support L3 functions.
# If you use a router service plugin, set this blank.
l3_plugin_list =
# supported extensions # Default flavor to use, when flavor:network is not specified at network
supported_extension_aliases = 'providernet' # creation.
# specific method map for each flavor to extensions default_flavor = 'nvp'
# Default L3 flavor to use, when flavor:router is not specified at router
# creation.
# Ignored if 'l3_plugin_list' is blank.
default_l3_flavor =
# Comma separated list of supported extension aliases.
supported_extension_aliases = 'provider,binding,agent,dhcp_agent_scheduler'
# Comma separated list of method:flavor to select specific plugin for a method.
# This has priority over method search order based on 'plugin_list'.
extension_map = 'get_port_stats:nvp' extension_map = 'get_port_stats:nvp'
# flavor of which plugin handles RPC # Specifies flavor for plugin to handle 'q-plugin' RPC requests.
rpc_flavor = rpc_flavor = 'ml2'

53
neutron/plugins/metaplugin/common/config.py
View File

@ -19,20 +19,45 @@ from oslo.config import cfg
meta_plugin_opts = [ meta_plugin_opts = [
cfg.StrOpt('plugin_list', default='', cfg.StrOpt(
help=_("List of plugins to load")), 'plugin_list',
cfg.StrOpt('l3_plugin_list', default='', default='',
help=_("List of L3 plugins to load")), help=_("Comma separated list of flavor:neutron_plugin for "
cfg.StrOpt('default_flavor', default='', "plugins to load. Extension method is searched in the "
help=_("Default flavor to use")), "list order and the first one is used.")),
cfg.StrOpt('default_l3_flavor', default='', cfg.StrOpt(
help=_("Default L3 flavor to use")), 'l3_plugin_list',
cfg.StrOpt('supported_extension_aliases', default='', default='',
help=_("Supported extension aliases")), help=_("Comma separated list of flavor:neutron_plugin for L3 "
cfg.StrOpt('extension_map', default='', "service plugins to load. This is intended for specifying "
help=_("A list of extensions, per plugin, to load.")), "L2 plugins which support L3 functions. If you use a router "
cfg.StrOpt('rpc_flavor', default='', "service plugin, set this blank.")),
help=_("Flavor of which plugin handles RPC")), cfg.StrOpt(
'default_flavor',
default='',
help=_("Default flavor to use, when flavor:network is not "
"specified at network creation.")),
cfg.StrOpt(
'default_l3_flavor',
default='',
help=_("Default L3 flavor to use, when flavor:router is not "
"specified at router creation. Ignored if 'l3_plugin_list' "
"is blank.")),
cfg.StrOpt(
'supported_extension_aliases',
default='',
help=_("Comma separated list of supported extension aliases.")),
cfg.StrOpt(
'extension_map',
default='',
help=_("Comma separated list of method:flavor to select specific "
"plugin for a method. This has priority over method search "
"order based on 'plugin_list'.")),
cfg.StrOpt(
'rpc_flavor',
default='',
help=_("Specifies flavor for plugin to handle 'q-plugin' RPC "
"requests.")),
] ]
proxy_plugin_opts = [ proxy_plugin_opts = [