diff --git a/doc/common/tables/neutron-meta.xml b/doc/common/tables/neutron-meta.xml deleted file mode 100644 index 20205b05db..0000000000 --- a/doc/common/tables/neutron-meta.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of meta configuration options
Configuration option = Default valueDescription
[META]
= (StrOpt) Default flavor to use, when flavor:network is not specified at network creation.
= (StrOpt) Default L3 flavor to use, when flavor:router is not specified at router creation. Ignored if 'l3_plugin_list' is blank.
= (StrOpt) Comma separated list of method:flavor to select specific plugin for a method. This has priority over method search order based on 'plugin_list'.
= (StrOpt) Comma separated list of flavor:neutron_plugin for L3 service plugins to load. This is intended for specifying L2 plugins which support L3 functions. If you use a router service plugin, set this blank.
= (StrOpt) Comma separated list of flavor:neutron_plugin for plugins to load. Extension method is searched in the list order and the first one is used.
= (StrOpt) Specifies flavor for plugin to handle 'q-plugin' RPC requests.
= (StrOpt) Comma separated list of supported extension aliases.
-
diff --git a/doc/config-reference/networking/section_networking-plugins.xml b/doc/config-reference/networking/section_networking-plugins.xml index c92f7f05cd..92b177c154 100644 --- a/doc/config-reference/networking/section_networking-plugins.xml +++ b/doc/config-reference/networking/section_networking-plugins.xml @@ -97,14 +97,6 @@ href="../../common/tables/neutron-linuxbridge_agent.xml" /> -
- Meta Plug-in configuration options - The Meta Plug-in allows you to use multiple - plug-ins at the same time. - -
MidoNet configuration options diff --git a/tools/autogenerate-config-flagmappings/neutron.flagmappings b/tools/autogenerate-config-flagmappings/neutron.flagmappings index 23bfaa6f0b..9bf2c536d9 100644 --- a/tools/autogenerate-config-flagmappings/neutron.flagmappings +++ b/tools/autogenerate-config-flagmappings/neutron.flagmappings @@ -251,13 +251,6 @@ L3_BROCADE_MLX_EXAMPLE/physical_networks l3_brocade_mlx L3_BROCADE_MLX_EXAMPLE/ports l3_brocade_mlx L3_BROCADE_MLX_EXAMPLE/username l3_brocade_mlx LINUX_BRIDGE/physical_interface_mappings linuxbridge_agent -META/default_flavor meta -META/default_l3_flavor meta -META/extension_map meta -META/l3_plugin_list meta -META/plugin_list meta -META/rpc_flavor meta -META/supported_extension_aliases meta MIDONET/client midonet MIDONET/cluster_ip midonet MIDONET/cluster_port midonet diff --git a/tools/autogenerate-config-flagmappings/neutron.headers b/tools/autogenerate-config-flagmappings/neutron.headers index a8a4e1fd5c..1f4297c21f 100644 --- a/tools/autogenerate-config-flagmappings/neutron.headers +++ b/tools/autogenerate-config-flagmappings/neutron.headers @@ -23,7 +23,6 @@ lbaas_haproxy LBaaS HAProxy plugin lbaas_netscaler LBaaS NetScaler plugin lbaas_radware LBaaS Radware plugin linuxbridge_agent Linux Bridge agent -meta meta metering_agent metering agent midonet Midonet ml2 ML2