openstack/openstack-manuals
Code Issues Proposed changes

Merge "[config-ref] update MacVTap plug-in"

Browse Source
This commit is contained in:
Jenkins 2016-06-08 11:59:10 +00:00 committed by Gerrit Code Review
commit 488a4e6339
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/config-reference/source/networking/networking_options_reference.rst
View File

@ -34,11 +34,6 @@ Linux bridge Agent configuration options
.. include:: ../tables/neutron-linuxbridge_agent.rst .. include:: ../tables/neutron-linuxbridge_agent.rst
MacVTap Agent configuration options
----------------------------------------
.. include:: ../tables/neutron-macvtap_agent.rst
Open vSwitch Agent configuration options Open vSwitch Agent configuration options
---------------------------------------- ----------------------------------------
@ -97,6 +92,11 @@ Modular Layer 2 (ml2) L2 Population Mechanism configuration options
.. include:: ../tables/neutron-ml2_l2pop.rst .. 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 Modular Layer 2 (ml2) SR-IOV Mechanism configuration options
------------------------------------------------------------ ------------------------------------------------------------

4
doc/config-reference/source/tables/neutron-macvtap_agent.rst → doc/config-reference/source/tables/neutron-ml2_macvtap.rst
View File

@ -8,9 +8,9 @@
autogenerate-config-doc tool from the openstack-doc-tools repository, or autogenerate-config-doc tool from the openstack-doc-tools repository, or
ask for help on the documentation mailing list, IRC channel or meeting. 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 :header-rows: 1
:class: config-ref-table :class: config-ref-table

4
tools/autogenerate-config-flagmappings/neutron.flagmappings
View File

@ -190,7 +190,7 @@ AGENT/minimize_polling openvswitch_agent
AGENT/ovsdb_monitor_respawn_interval openvswitch_agent AGENT/ovsdb_monitor_respawn_interval openvswitch_agent
AGENT/polling_interval common AGENT/polling_interval common
AGENT/prevent_arp_spoofing openvswitch_agent 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/report_interval metering_agent
AGENT/root_helper common AGENT/root_helper common
AGENT/root_helper_daemon 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/signing_dir auth_token
keystone_authtoken/token_cache_time auth_token keystone_authtoken/token_cache_time auth_token
l2pop/agent_boot_time ml2_l2pop 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/check_timeout redis
matchmaker_redis/host redis matchmaker_redis/host redis
matchmaker_redis/password redis matchmaker_redis/password redis

2
tools/autogenerate-config-flagmappings/neutron.headers
View File

@ -28,7 +28,6 @@ lbaas_agent LBaaS agent
lbaas_services LBaaS Embrane, Radware, NetScaler, HAproxy, Octavia plugin lbaas_services LBaaS Embrane, Radware, NetScaler, HAproxy, Octavia plugin
octavia Octavia octavia Octavia
linuxbridge_agent Linux Bridge agent linuxbridge_agent Linux Bridge agent
macvtap_agent MacVTap agent
metering_agent metering agent metering_agent metering agent
midonet Midonet midonet Midonet
ml2 ML2 ml2 ML2
@ -45,6 +44,7 @@ ml2_fslsdn ML2 Freescale SDN mechanism driver
ml2_geneve ML2 Geneve type driver ml2_geneve ML2 Geneve type driver
ml2_gre ML2 GRE ml2_gre ML2 GRE
ml2_l2pop ML2 L2 population ml2_l2pop ML2 L2 population
ml2_macvtap ML2 MacVTap mechanism driver
ml2_mlnx Mellanox ML2 mechanism driver ml2_mlnx Mellanox ML2 mechanism driver
ml2_ncs ML2 NCS mechanism driver ml2_ncs ML2 NCS mechanism driver
ml2_odl ML2 OpenDaylight mechanism driver ml2_odl ML2 OpenDaylight mechanism driver