diff --git a/doc/admin-guide-cloud/networking/section_networking_introduction.xml b/doc/admin-guide-cloud/networking/section_networking_introduction.xml index b88a55d3c1..5e01ecc388 100644 --- a/doc/admin-guide-cloud/networking/section_networking_introduction.xml +++ b/doc/admin-guide-cloud/networking/section_networking_introduction.xml @@ -442,12 +442,6 @@ enabled = True xlink:href="http://wiki.openstack.org/Neutron-Linux-Bridge-Plugin" >http://wiki.openstack.org/Neutron-Linux-Bridge-Plugin - - Mellanox - https://wiki.openstack.org/wiki/Mellanox-Neutron/ - Midonet plug-ins are now part of the ML2 plug-in in the form of mechanism drivers. + + Plug-in removal notice + The Mellanox plug-in has been removed in the Kilo + release. + Not all Networking plug-ins are compatible with all possible Compute drivers: @@ -589,14 +588,6 @@ enabled = True - - - - diff --git a/doc/common/tables/neutron-ml2_mlnx.xml b/doc/common/tables/neutron-ml2_mlnx.xml deleted file mode 100644 index 39980b6811..0000000000 --- a/doc/common/tables/neutron-ml2_mlnx.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - -
MellanoxYes - - - -
Midonet Yes
- - - - - - - - - - - - - - - - - - -
Description of Mellanox ML2 mechanism driver configuration options
Configuration option = Default valueDescription
[ESWITCH]
vnic_type = mlnx_direct(StrOpt) Type of VM network interface: mlnx_direct or hostdev
- diff --git a/doc/common/tables/neutron-mlnx.xml b/doc/common/tables/neutron-mlnx.xml deleted file mode 100644 index ae3ce4ff26..0000000000 --- a/doc/common/tables/neutron-mlnx.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Description of Mellanox configuration options
Configuration option = Default valueDescription
[ESWITCH]
backoff_rate = 2(IntOpt) backoff rate multiplier for waiting period between retries for request to daemon, i.e. value of 2 will double the request timeout each retry
daemon_endpoint = tcp://127.0.0.1:60001(StrOpt) eswitch daemon end point
physical_interface_mappings = (ListOpt) List of <physical_network>:<physical_interface>
request_timeout = 3000(IntOpt) The number of milliseconds the agent will wait for response on request to daemon.
[MLNX]
network_vlan_ranges = default:1:1000(ListOpt) List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>
physical_network_type = eth(StrOpt) Physical network type for provider network (eth or ib)
physical_network_type_mappings = (ListOpt) List of <physical_network>:<physical_network_type> with physical_network_type is either eth or ib
tenant_network_type = vlan(StrOpt) Network type for tenant networks (local, vlan, or none)
-
diff --git a/doc/config-reference/networking/section_networking-plugins-ml2.xml b/doc/config-reference/networking/section_networking-plugins-ml2.xml index ac6e29d563..74a981aad1 100644 --- a/doc/config-reference/networking/section_networking-plugins-ml2.xml +++ b/doc/config-reference/networking/section_networking-plugins-ml2.xml @@ -83,11 +83,6 @@ options -
- Modular Layer 2 (ml2) Mellanox Mechanism configuration - options - -
Modular Layer 2 (ml2) OpenDaylight Mechanism configuration options diff --git a/doc/config-reference/networking/section_networking-plugins.xml b/doc/config-reference/networking/section_networking-plugins.xml index 49b4b70bd1..272d92ebdb 100644 --- a/doc/config-reference/networking/section_networking-plugins.xml +++ b/doc/config-reference/networking/section_networking-plugins.xml @@ -15,10 +15,18 @@ L2-in-L3 tunneling or OpenFlow. These sections detail the configuration options for the various plug-ins. - Ryu plugin has been removed in Kilo. Ryu team recommends - to migrate to ML2 plugin with ofagent mechanism driver. - However, it isn't a functionality equivalent. - No mechanical upgrade procedure is provided. + The following plugins have been removed in + Kilo: + + Ryu plugin. The Ryu team recommends + that you migrate to the ML2 plugin with ofagent + mechanism driver. However, note that the + functionality is not the same. There is no + upgrade procedure currently available. + + Mellanox plugin. + +
BigSwitch configuration options
-
- Mellanox configuration options - -
Meta Plug-in configuration options The Meta Plug-in allows you to use multiple