From cef018270e8db140a76e9898c9f91469194c6d22 Mon Sep 17 00:00:00 2001 From: KATO Tomoyuki Date: Tue, 7 Jun 2016 22:48:14 +0900 Subject: [PATCH] [config-ref] update MacVTap plug-in Move from MacVTap Agent to ML2 MacVTap mechanism driver. backport: mitaka Change-Id: I720421ed11010f6800914e31082805046500e0b1 Partial-Bug: #1589094 --- .../source/networking/networking_options_reference.rst | 10 +++++----- ...utron-macvtap_agent.rst => neutron-ml2_macvtap.rst} | 4 ++-- .../neutron.flagmappings | 4 ++-- tools/autogenerate-config-flagmappings/neutron.headers | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) rename doc/config-reference/source/tables/{neutron-macvtap_agent.rst => neutron-ml2_macvtap.rst} (91%) diff --git a/doc/config-reference/source/networking/networking_options_reference.rst b/doc/config-reference/source/networking/networking_options_reference.rst index 599fee8f6e..ad546ed713 100644 --- a/doc/config-reference/source/networking/networking_options_reference.rst +++ b/doc/config-reference/source/networking/networking_options_reference.rst @@ -34,11 +34,6 @@ Linux bridge Agent configuration options .. include:: ../tables/neutron-linuxbridge_agent.rst -MacVTap Agent configuration options ----------------------------------------- - -.. include:: ../tables/neutron-macvtap_agent.rst - Open vSwitch Agent configuration options ---------------------------------------- @@ -97,6 +92,11 @@ Modular Layer 2 (ml2) L2 Population Mechanism configuration options .. include:: ../tables/neutron-ml2_l2pop.rst +Modular Layer 2 (ml2) MacVTap Mechanism configuration options +------------------------------------------------------------- + +.. include:: ../tables/neutron-ml2_macvtap.rst + Modular Layer 2 (ml2) SR-IOV Mechanism configuration options ------------------------------------------------------------ diff --git a/doc/config-reference/source/tables/neutron-macvtap_agent.rst b/doc/config-reference/source/tables/neutron-ml2_macvtap.rst similarity index 91% rename from doc/config-reference/source/tables/neutron-macvtap_agent.rst rename to doc/config-reference/source/tables/neutron-ml2_macvtap.rst index 8809926d93..02bfd9ee41 100644 --- a/doc/config-reference/source/tables/neutron-macvtap_agent.rst +++ b/doc/config-reference/source/tables/neutron-ml2_macvtap.rst @@ -8,9 +8,9 @@ autogenerate-config-doc tool from the openstack-doc-tools repository, or ask for help on the documentation mailing list, IRC channel or meeting. -.. _neutron-macvtap_agent: +.. _neutron-ml2_macvtap: -.. list-table:: Description of MacVTap agent configuration options +.. list-table:: Description of ML2 MacVTap mechanism driver configuration options :header-rows: 1 :class: config-ref-table diff --git a/tools/autogenerate-config-flagmappings/neutron.flagmappings b/tools/autogenerate-config-flagmappings/neutron.flagmappings index e51126d883..abbffbc054 100644 --- a/tools/autogenerate-config-flagmappings/neutron.flagmappings +++ b/tools/autogenerate-config-flagmappings/neutron.flagmappings @@ -190,7 +190,7 @@ AGENT/minimize_polling openvswitch_agent AGENT/ovsdb_monitor_respawn_interval openvswitch_agent AGENT/polling_interval common AGENT/prevent_arp_spoofing openvswitch_agent -AGENT/quitting_rpc_timeout openvswitch_agent linuxbridge_agent macvtap_agent +AGENT/quitting_rpc_timeout openvswitch_agent linuxbridge_agent ml2_macvtap AGENT/report_interval metering_agent AGENT/root_helper common AGENT/root_helper_daemon common @@ -348,7 +348,7 @@ keystone_authtoken/revocation_cache_time auth_token keystone_authtoken/signing_dir auth_token keystone_authtoken/token_cache_time auth_token l2pop/agent_boot_time ml2_l2pop -macvtap/physical_interface_mappings macvtap_agent +macvtap/physical_interface_mappings ml2_macvtap matchmaker_redis/check_timeout redis matchmaker_redis/host redis matchmaker_redis/password redis diff --git a/tools/autogenerate-config-flagmappings/neutron.headers b/tools/autogenerate-config-flagmappings/neutron.headers index d1d543b58e..74a9891985 100644 --- a/tools/autogenerate-config-flagmappings/neutron.headers +++ b/tools/autogenerate-config-flagmappings/neutron.headers @@ -28,7 +28,6 @@ lbaas_agent LBaaS agent lbaas_services LBaaS Embrane, Radware, NetScaler, HAproxy, Octavia plugin octavia Octavia linuxbridge_agent Linux Bridge agent -macvtap_agent MacVTap agent metering_agent metering agent midonet Midonet ml2 ML2 @@ -45,6 +44,7 @@ ml2_fslsdn ML2 Freescale SDN mechanism driver ml2_geneve ML2 Geneve type driver ml2_gre ML2 GRE ml2_l2pop ML2 L2 population +ml2_macvtap ML2 MacVTap mechanism driver ml2_mlnx Mellanox ML2 mechanism driver ml2_ncs ML2 NCS mechanism driver ml2_odl ML2 OpenDaylight mechanism driver