diff --git a/doc/common/tables/neutron-amqp.xml b/doc/common/tables/neutron-amqp.xml
index 50d0d3fce2..8a46e258b0 100644
--- a/doc/common/tables/neutron-amqp.xml
+++ b/doc/common/tables/neutron-amqp.xml
@@ -17,14 +17,6 @@
<tr>
<th colspan="2">[DEFAULT]</th>
</tr>
- <tr>
- <td><option>amqp_auto_delete</option> = <replaceable>False</replaceable></td>
- <td>(BoolOpt) Auto-delete queues in AMQP.</td>
- </tr>
- <tr>
- <td><option>amqp_durable_queues</option> = <replaceable>False</replaceable></td>
- <td>(BoolOpt) Use durable queues in AMQP.</td>
- </tr>
<tr>
<td><option>control_exchange</option> = <replaceable>neutron</replaceable></td>
<td>(StrOpt) The default exchange under which topics are scoped. May be overridden by an exchange name specified in the transport_url option.</td>
diff --git a/doc/common/tables/neutron-api.xml b/doc/common/tables/neutron-api.xml
index eebfd62a30..ea22ac7beb 100644
--- a/doc/common/tables/neutron-api.xml
+++ b/doc/common/tables/neutron-api.xml
@@ -45,10 +45,6 @@
<td><option>client_socket_timeout</option> = <replaceable>900</replaceable></td>
<td>(IntOpt) Timeout for client connections socket operations. If an incoming connection is idle for this number of seconds it will be closed. A value of '0' means wait forever.</td>
</tr>
- <tr>
- <td><option>conn_idle_timeout</option> = <replaceable>900</replaceable></td>
- <td>(IntOpt) Reconnect connection to nsx if not used within this amount of time.</td>
- </tr>
<tr>
<td><option>max_header_line</option> = <replaceable>16384</replaceable></td>
<td>(IntOpt) Max header line to accommodate large tokens</td>
diff --git a/doc/common/tables/neutron-auth_token.xml b/doc/common/tables/neutron-auth_token.xml
index 99071076b7..206c3fcf15 100644
--- a/doc/common/tables/neutron-auth_token.xml
+++ b/doc/common/tables/neutron-auth_token.xml
@@ -119,7 +119,7 @@
</tr>
<tr>
<td><option>memcache_pool_conn_get_timeout</option> = <replaceable>10</replaceable></td>
- <td>(IntOpt) (Optional) Number of seconds that an operation will wait to get a memcache client connection from the pool.</td>
+ <td>(IntOpt) (Optional) Number of seconds that an operation will wait to get a memcached client connection from the pool.</td>
</tr>
<tr>
<td><option>memcache_pool_dead_retry</option> = <replaceable>300</replaceable></td>
@@ -131,7 +131,7 @@
</tr>
<tr>
<td><option>memcache_pool_socket_timeout</option> = <replaceable>3</replaceable></td>
- <td>(IntOpt) (Optional) Socket timeout in seconds for communicating with a memcache server.</td>
+ <td>(IntOpt) (Optional) Socket timeout in seconds for communicating with a memcached server.</td>
</tr>
<tr>
<td><option>memcache_pool_unused_timeout</option> = <replaceable>60</replaceable></td>
@@ -147,7 +147,7 @@
</tr>
<tr>
<td><option>memcache_use_advanced_pool</option> = <replaceable>False</replaceable></td>
- <td>(BoolOpt) (Optional) Use the advanced (eventlet safe) memcache client pool. The advanced pool will only work under python 2.x.</td>
+ <td>(BoolOpt) (Optional) Use the advanced (eventlet safe) memcached client pool. The advanced pool will only work under python 2.x.</td>
</tr>
<tr>
<td><option>revocation_cache_time</option> = <replaceable>10</replaceable></td>
diff --git a/doc/common/tables/neutron-bigswitch.xml b/doc/common/tables/neutron-bigswitch.xml
index 52132f3c76..f4d6f35850 100644
--- a/doc/common/tables/neutron-bigswitch.xml
+++ b/doc/common/tables/neutron-bigswitch.xml
@@ -82,7 +82,7 @@
<td>(ListOpt) Nova compute nodes to manually set VIF type to vrouter</td>
</tr>
<tr>
- <td><option>vif_type</option> = <replaceable>ovs</replaceable></td>
+ <td><option>vif_type</option> = <replaceable>ivs</replaceable></td>
<td>(StrOpt) Virtual interface type to configure on Nova compute nodes</td>
</tr>
<tr>
@@ -109,7 +109,7 @@
<td>(IntOpt) Time between verifications that the backend controller database is consistent with Neutron. (0 to disable)</td>
</tr>
<tr>
- <td><option>neutron_id</option> = <replaceable>neutron-shock</replaceable></td>
+ <td><option>neutron_id</option> = <replaceable>neutron-images</replaceable></td>
<td>(StrOpt) User defined identifier for this Neutron deployment</td>
</tr>
<tr>
@@ -160,7 +160,7 @@
<td>(IntOpt) Seconds between agent checks for port changes</td>
</tr>
<tr>
- <td><option>virtual_switch_type</option> = <replaceable>ovs</replaceable></td>
+ <td><option>virtual_switch_type</option> = <replaceable>ivs</replaceable></td>
<td>(StrOpt) Virtual switch type.</td>
</tr>
<tr>
diff --git a/doc/common/tables/neutron-cisco.xml b/doc/common/tables/neutron-cisco.xml
index 702ba3de82..447b0ddc47 100644
--- a/doc/common/tables/neutron-cisco.xml
+++ b/doc/common/tables/neutron-cisco.xml
@@ -108,6 +108,17 @@
<td><option>vxlan_id_ranges</option> = <replaceable>5000:10000</replaceable></td>
<td>(StrOpt) N1K VXLAN ID Ranges</td>
</tr>
+ <tr>
+ <th colspan="2">[cfg_agent]</th>
+ </tr>
+ <tr>
+ <td><option>device_connection_timeout</option> = <replaceable>30</replaceable></td>
+ <td>(IntOpt) Time in seconds for connecting to a hosting device</td>
+ </tr>
+ <tr>
+ <td><option>hosting_device_dead_timeout</option> = <replaceable>300</replaceable></td>
+ <td>(IntOpt) The time in seconds until a backlogged hosting device is presumed dead. This value should be set up high enough to recover from a period of connectivity loss or high load when the device may not be responding.</td>
+ </tr>
<tr>
<th colspan="2">[general]</th>
</tr>
@@ -151,15 +162,11 @@
<td>(IntOpt) Booting time in seconds before a CSR1kv becomes operational.</td>
</tr>
<tr>
- <td><option>csr1kv_cfgagent_router_driver</option> = <replaceable>neutron.plugins.cisco.cfg_agent.device_drivers.csr1kv.csr1kv_routing_driver.CSR1kvRoutingDriver</replaceable></td>
+ <td><option>csr1kv_cfgagent_router_driver</option> = <replaceable>networking_cisco.plugins.cisco.cfg_agent.device_drivers.csr1kv.csr1kv_routing_driver.CSR1kvRoutingDriver</replaceable></td>
<td>(StrOpt) Config agent driver for CSR1kv.</td>
</tr>
<tr>
- <td><option>csr1kv_configdrive_template</option> = <replaceable>csr1kv_cfg_template</replaceable></td>
- <td>(StrOpt) CSR1kv configdrive template file.</td>
- </tr>
- <tr>
- <td><option>csr1kv_device_driver</option> = <replaceable>neutron.plugins.cisco.l3.hosting_device_drivers.csr1kv_hd_driver.CSR1kvHostingDeviceDriver</replaceable></td>
+ <td><option>csr1kv_device_driver</option> = <replaceable>networking_cisco.plugins.cisco.l3.hosting_device_drivers.csr1kv_hd_driver.CSR1kvHostingDeviceDriver</replaceable></td>
<td>(StrOpt) Hosting device driver for CSR1kv.</td>
</tr>
<tr>
@@ -175,36 +182,13 @@
<td>(StrOpt) Password to use for CSR1kv configurations.</td>
</tr>
<tr>
- <td><option>csr1kv_plugging_driver</option> = <replaceable>neutron.plugins.cisco.l3.plugging_drivers.n1kv_trunking_driver.N1kvTrunkingPlugDriver</replaceable></td>
+ <td><option>csr1kv_plugging_driver</option> = <replaceable>networking_cisco.plugins.cisco.l3.plugging_drivers.n1kv_trunking_driver.N1kvTrunkingPlugDriver</replaceable></td>
<td>(StrOpt) Plugging driver for CSR1kv.</td>
</tr>
<tr>
<td><option>csr1kv_username</option> = <replaceable>stack</replaceable></td>
<td>(StrOpt) Username to use for CSR1kv configurations.</td>
</tr>
- <tr>
- <th colspan="2">[n1kv]</th>
- </tr>
- <tr>
- <td><option>management_port_profile</option> = <replaceable>osn_mgmt_pp</replaceable></td>
- <td>(StrOpt) Name of N1kv port profile for management ports.</td>
- </tr>
- <tr>
- <td><option>t1_network_profile</option> = <replaceable>osn_t1_np</replaceable></td>
- <td>(StrOpt) Name of N1kv network profile for T1 networks (i.e., trunk networks for VXLAN segmented traffic).</td>
- </tr>
- <tr>
- <td><option>t1_port_profile</option> = <replaceable>osn_t1_pp</replaceable></td>
- <td>(StrOpt) Name of N1kv port profile for T1 ports (i.e., ports carrying traffic from VXLAN segmented networks).</td>
- </tr>
- <tr>
- <td><option>t2_network_profile</option> = <replaceable>osn_t2_np</replaceable></td>
- <td>(StrOpt) Name of N1kv network profile for T2 networks (i.e., trunk networks for VLAN segmented traffic).</td>
- </tr>
- <tr>
- <td><option>t2_port_profile</option> = <replaceable>osn_t2_pp</replaceable></td>
- <td>(StrOpt) Name of N1kv port profile for T2 ports (i.e., ports carrying traffic from VLAN segmented networks).</td>
- </tr>
</tbody>
</table>
</para>
diff --git a/doc/common/tables/neutron-common.xml b/doc/common/tables/neutron-common.xml
index f76c2d9c47..057df5ee80 100644
--- a/doc/common/tables/neutron-common.xml
+++ b/doc/common/tables/neutron-common.xml
@@ -69,21 +69,17 @@
<td><option>bind_port</option> = <replaceable>9696</replaceable></td>
<td>(IntOpt) The port to bind to</td>
</tr>
- <tr>
- <td><option>ca_certs</option> = <replaceable>None</replaceable></td>
- <td>(StrOpt) CA certificates</td>
- </tr>
<tr>
<td><option>core_plugin</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) The core plugin Neutron will use</td>
</tr>
<tr>
- <td><option>ctl_cert</option> = <replaceable>None</replaceable></td>
- <td>(StrOpt) controller certificate</td>
+ <td><option>default_ipv4_subnet_pool</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Default IPv4 subnet-pool to be used for automatic subnet CIDR allocation</td>
</tr>
<tr>
- <td><option>ctl_privkey</option> = <replaceable>None</replaceable></td>
- <td>(StrOpt) controller private key</td>
+ <td><option>default_ipv6_subnet_pool</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Default IPv6 subnet-pool to be used for automatic subnet CIDR allocation</td>
</tr>
<tr>
<td><option>dhcp_agent_notification</option> = <replaceable>True</replaceable></td>
@@ -91,7 +87,7 @@
</tr>
<tr>
<td><option>dhcp_agents_per_network</option> = <replaceable>1</replaceable></td>
- <td>(IntOpt) Number of DHCP agents scheduled to host a network.</td>
+ <td>(IntOpt) Number of DHCP agents scheduled to host a tenant network. If this number is greater than 1, the scheduler automatically assigns multiple DHCP agents for a given tenant network, providing high availability for DHCP service.</td>
</tr>
<tr>
<td><option>dhcp_broadcast_reply</option> = <replaceable>False</replaceable></td>
@@ -117,6 +113,18 @@
<td><option>dhcp_lease_duration</option> = <replaceable>86400</replaceable></td>
<td>(IntOpt) DHCP lease duration (in seconds). Use -1 to tell dnsmasq to use infinite lease times.</td>
</tr>
+ <tr>
+ <td><option>dhcp_load_type</option> = <replaceable>networks</replaceable></td>
+ <td>(StrOpt) Representing the resource type whose load is being reported by the agent. This can be "networks", "subnets" or "ports". When specified (Default is networks), the server will extract particular load sent as part of its agent configuration object from the agent report state, which is the number of resources being consumed, at every report_interval.dhcp_load_type can be used in combination with network_scheduler_driver = neutron.scheduler.dhcp_agent_scheduler.WeightScheduler When the network_scheduler_driver is WeightScheduler, dhcp_load_type can be configured to represent the choice for the resource being balanced. Example: dhcp_load_type=networks</td>
+ </tr>
+ <tr>
+ <td><option>ebtables_path</option> = <replaceable>$state_path/ebtables-</replaceable></td>
+ <td>(StrOpt) Location of temporary ebtables table files.</td>
+ </tr>
+ <tr>
+ <td><option>enable_services_on_agents_with_admin_state_down</option> = <replaceable>False</replaceable></td>
+ <td>(BoolOpt) Enable services on an agent with admin_state_up False. If this option is False, when admin_state_up of an agent is turned False, services on it will be disabled. Agents with admin_state_up False are not selected for automatic scheduling regardless of this option. But manual scheduling to such agents is available if this option is True.</td>
+ </tr>
<tr>
<td><option>endpoint_type</option> = <replaceable>publicURL</replaceable></td>
<td>(StrOpt) Network service endpoint type to pull from the keystone catalog</td>
@@ -127,7 +135,7 @@
</tr>
<tr>
<td><option>host</option> = <replaceable>localhost</replaceable></td>
- <td>(StrOpt) Hostname to be used by the neutron server, agents andservices running on this machine. All the agents and services running on this machine must use the same host value.</td>
+ <td>(StrOpt) Hostname to be used by the neutron server, agents and services running on this machine. All the agents and services running on this machine must use the same host value.</td>
</tr>
<tr>
<td><option>interface_driver</option> = <replaceable>None</replaceable></td>
@@ -169,6 +177,10 @@
<td><option>periodic_interval</option> = <replaceable>40</replaceable></td>
<td>(IntOpt) Seconds between running periodic tasks</td>
</tr>
+ <tr>
+ <td><option>periodic_monitoring_interval</option> = <replaceable>5</replaceable></td>
+ <td>(IntOpt) Periodic interval at which the plugin checks for the monitoring L2 gateway agent</td>
+ </tr>
<tr>
<td><option>report_interval</option> = <replaceable>300</replaceable></td>
<td>(IntOpt) Interval between two metering reports</td>
@@ -177,6 +189,10 @@
<td><option>state_path</option> = <replaceable>/var/lib/neutron</replaceable></td>
<td>(StrOpt) Where to store Neutron state files. This directory must be writable by the agent.</td>
</tr>
+ <tr>
+ <td><option>vlan_transparent</option> = <replaceable>False</replaceable></td>
+ <td>(BoolOpt) If True, then allow plugins that support it to create VLAN transparent networks.</td>
+ </tr>
<tr>
<th colspan="2">[AGENT]</th>
</tr>
@@ -185,13 +201,17 @@
<td>(StrOpt) Action to be executed when a child process dies</td>
</tr>
<tr>
- <td><option>check_child_processes_interval</option> = <replaceable>0</replaceable></td>
+ <td><option>check_child_processes_interval</option> = <replaceable>60</replaceable></td>
<td>(IntOpt) Interval between checks of child process liveness (seconds), use 0 to disable</td>
</tr>
<tr>
<td><option>root_helper</option> = <replaceable>sudo</replaceable></td>
<td>(StrOpt) Root helper application.</td>
</tr>
+ <tr>
+ <td><option>root_helper_daemon</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Root helper daemon application to use when possible.</td>
+ </tr>
<tr>
<th colspan="2">[PROXY]</th>
</tr>
diff --git a/doc/common/tables/neutron-compute.xml b/doc/common/tables/neutron-compute.xml
index a37036dc07..96ef9420c0 100644
--- a/doc/common/tables/neutron-compute.xml
+++ b/doc/common/tables/neutron-compute.xml
@@ -27,31 +27,23 @@
</tr>
<tr>
<td><option>nova_admin_auth_url</option> = <replaceable>http://localhost:5000/v2.0</replaceable></td>
- <td>(StrOpt) Authorization URL for connecting to nova in admin context</td>
+ <td>(StrOpt) Authorization URL for connecting to nova in admin context. Deprecated in favour of an auth plugin in [nova].</td>
</tr>
<tr>
<td><option>nova_admin_password</option> = <replaceable>None</replaceable></td>
- <td>(StrOpt) Password for connection to nova in admin context</td>
+ <td>(StrOpt) Password for connection to nova in admin context. Deprecated in favour of an auth plugin in [nova].</td>
</tr>
<tr>
<td><option>nova_admin_tenant_id</option> = <replaceable>None</replaceable></td>
- <td>(StrOpt) The uuid of the admin nova tenant</td>
+ <td>(StrOpt) The uuid of the admin nova tenant. Deprecated in favour of an auth plugin in [nova].</td>
</tr>
<tr>
<td><option>nova_admin_tenant_name</option> = <replaceable>None</replaceable></td>
- <td>(StrOpt) The name of the admin nova tenant</td>
+ <td>(StrOpt) The name of the admin nova tenant. Deprecated in favour of an auth plugin in [nova].</td>
</tr>
<tr>
<td><option>nova_admin_username</option> = <replaceable>None</replaceable></td>
- <td>(StrOpt) Username for connecting to nova in admin context</td>
- </tr>
- <tr>
- <td><option>nova_api_insecure</option> = <replaceable>False</replaceable></td>
- <td>(BoolOpt) If True, ignore any SSL validation issues</td>
- </tr>
- <tr>
- <td><option>nova_ca_certificates_file</option> = <replaceable>None</replaceable></td>
- <td>(StrOpt) CA file for novaclient to verify server certificates</td>
+ <td>(StrOpt) Username for connecting to nova in admin context. Deprecated in favour of an auth plugin in [nova].</td>
</tr>
<tr>
<td><option>nova_client_cert</option> = <replaceable></replaceable></td>
@@ -61,13 +53,9 @@
<td><option>nova_client_priv_key</option> = <replaceable></replaceable></td>
<td>(StrOpt) Private key of client certificate.</td>
</tr>
- <tr>
- <td><option>nova_region_name</option> = <replaceable>None</replaceable></td>
- <td>(StrOpt) Name of nova region to use. Useful if keystone manages more than one region.</td>
- </tr>
<tr>
<td><option>nova_url</option> = <replaceable>http://127.0.0.1:8774/v2</replaceable></td>
- <td>(StrOpt) URL for connection to nova</td>
+ <td>(StrOpt) URL for connection to nova. Deprecated in favour of an auth plugin in [nova].</td>
</tr>
<tr>
<td><option>send_events_interval</option> = <replaceable>2</replaceable></td>
diff --git a/doc/common/tables/neutron-database.xml b/doc/common/tables/neutron-database.xml
index 363c88f684..c73f0c53ca 100644
--- a/doc/common/tables/neutron-database.xml
+++ b/doc/common/tables/neutron-database.xml
@@ -35,19 +35,19 @@
</tr>
<tr>
<td><option>db_inc_retry_interval</option> = <replaceable>True</replaceable></td>
- <td>(BoolOpt) If True, increases the interval between database connection retries up to db_max_retry_interval.</td>
+ <td>(BoolOpt) If True, increases the interval between retries of a database operation up to db_max_retry_interval.</td>
</tr>
<tr>
<td><option>db_max_retries</option> = <replaceable>20</replaceable></td>
- <td>(IntOpt) Maximum database connection retries before error is raised. Set to -1 to specify an infinite retry count.</td>
+ <td>(IntOpt) Maximum retries in case of connection error or deadlock error before error is raised. Set to -1 to specify an infinite retry count.</td>
</tr>
<tr>
<td><option>db_max_retry_interval</option> = <replaceable>10</replaceable></td>
- <td>(IntOpt) If db_inc_retry_interval is set, the maximum seconds between database connection retries.</td>
+ <td>(IntOpt) If db_inc_retry_interval is set, the maximum seconds between retries of a database operation.</td>
</tr>
<tr>
<td><option>db_retry_interval</option> = <replaceable>1</replaceable></td>
- <td>(IntOpt) Seconds between database connection retries.</td>
+ <td>(IntOpt) Seconds between retries of a database transaction.</td>
</tr>
<tr>
<td><option>idle_timeout</option> = <replaceable>3600</replaceable></td>
diff --git a/doc/common/tables/neutron-dhcp_agent.xml b/doc/common/tables/neutron-dhcp_agent.xml
index da77361b79..ab5dacbc43 100644
--- a/doc/common/tables/neutron-dhcp_agent.xml
+++ b/doc/common/tables/neutron-dhcp_agent.xml
@@ -17,6 +17,10 @@
<tr>
<th colspan="2">[DEFAULT]</th>
</tr>
+ <tr>
+ <td><option>advertise_mtu</option> = <replaceable>False</replaceable></td>
+ <td>(BoolOpt) If True, effort is made to advertise MTU settings to VMs via network methods (DHCP and RA MTU options) when the network's preferred MTU is known.</td>
+ </tr>
<tr>
<td><option>dnsmasq_config_file</option> = <replaceable></replaceable></td>
<td>(StrOpt) Override the default dnsmasq settings with this file</td>
@@ -47,7 +51,7 @@
</tr>
<tr>
<td><option>use_namespaces</option> = <replaceable>True</replaceable></td>
- <td>(BoolOpt) Allow overlapping IP.</td>
+ <td>(BoolOpt) Allow overlapping IP. This option is deprecated and will be removed in a future release.</td>
</tr>
</tbody>
</table>
diff --git a/doc/common/tables/neutron-hyperv_agent.xml b/doc/common/tables/neutron-hyperv_agent.xml
index ae3db7b33d..8f686cfa70 100644
--- a/doc/common/tables/neutron-hyperv_agent.xml
+++ b/doc/common/tables/neutron-hyperv_agent.xml
@@ -37,17 +37,6 @@
<td><option>polling_interval</option> = <replaceable>2</replaceable></td>
<td>(IntOpt) The number of seconds the agent will wait between polling for local device changes.</td>
</tr>
- <tr>
- <th colspan="2">[HYPERV]</th>
- </tr>
- <tr>
- <td><option>network_vlan_ranges</option> = <replaceable></replaceable></td>
- <td>(ListOpt) List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network></td>
- </tr>
- <tr>
- <td><option>tenant_network_type</option> = <replaceable>local</replaceable></td>
- <td>(StrOpt) Network type for tenant networks (local, flat, vlan or none)</td>
- </tr>
<tr>
<th colspan="2">[hyperv]</th>
</tr>
diff --git a/doc/common/tables/neutron-l2gw.xml b/doc/common/tables/neutron-l2gw.xml
new file mode 100644
index 0000000000..1af7ddfef1
--- /dev/null
+++ b/doc/common/tables/neutron-l2gw.xml
@@ -0,0 +1,69 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<para xmlns="http://docbook.org/ns/docbook" version="5.0">
+ <!-- Warning: Do not edit this file. It is automatically
+ generated and your changes will be overwritten.
+ The tool to do so lives in openstack-doc-tools repository. -->
+ <table rules="all" xml:id="config_table_neutron_l2gw">
+ <caption>Description of Layer 2 Gateway configuration options</caption>
+ <col width="50%"/>
+ <col width="50%"/>
+ <thead>
+ <tr>
+ <th>Configuration option = Default value</th>
+ <th>Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <th colspan="2">[DEFAULT]</th>
+ </tr>
+ <tr>
+ <td><option>default_device_name</option> = <replaceable>Switch1</replaceable></td>
+ <td>(StrOpt) default_device_name of the l2 gateway</td>
+ </tr>
+ <tr>
+ <td><option>default_l2_gw_service_uuid</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Unique identifier of the NSX L2 Gateway service which will be used by default for network gateways</td>
+ </tr>
+ <tr>
+ <td><option>default_l3_gw_service_uuid</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Unique identifier of the NSX L3 Gateway service which will be used for implementing routers and floating IPs</td>
+ </tr>
+ <tr>
+ <td><option>l2gw_callback_class</option> = <replaceable>networking_l2gw.services.l2gateway.ovsdb.data.L2GatewayOVSDBCallbacks</replaceable></td>
+ <td>(StrOpt) L2 gateway plugin callback class where theRPCs from the agent are going to get invoked</td>
+ </tr>
+ <tr>
+ <td><option>quota_l2_gateway</option> = <replaceable>5</replaceable></td>
+ <td>(IntOpt) Number of l2 gateways allowed per tenant, -1 for unlimited</td>
+ </tr>
+ <tr>
+ <th colspan="2">[ovsdb]</th>
+ </tr>
+ <tr>
+ <td><option>l2_gw_agent_ca_cert_base_path</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Trusted issuer CA cert</td>
+ </tr>
+ <tr>
+ <td><option>l2_gw_agent_cert_base_path</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) L2 gateway agent public certificate</td>
+ </tr>
+ <tr>
+ <td><option>l2_gw_agent_priv_key_base_path</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) L2 gateway agent private key</td>
+ </tr>
+ <tr>
+ <td><option>max_connection_retries</option> = <replaceable>10</replaceable></td>
+ <td>(IntOpt) Maximum number of retries to open a socket with the OVSDB server</td>
+ </tr>
+ <tr>
+ <td><option>ovsdb_hosts</option> = <replaceable>host1:127.0.0.1:6632</replaceable></td>
+ <td>(StrOpt) OVSDB server name:host/IP:port</td>
+ </tr>
+ <tr>
+ <td><option>periodic_interval</option> = <replaceable>20</replaceable></td>
+ <td>(IntOpt) Seconds between periodic task runs</td>
+ </tr>
+ </tbody>
+ </table>
+</para>
diff --git a/doc/common/tables/neutron-l3_agent.xml b/doc/common/tables/neutron-l3_agent.xml
index cfef3ac158..f7ef8dc443 100644
--- a/doc/common/tables/neutron-l3_agent.xml
+++ b/doc/common/tables/neutron-l3_agent.xml
@@ -33,6 +33,10 @@
<td><option>enable_metadata_proxy</option> = <replaceable>True</replaceable></td>
<td>(BoolOpt) Allow running metadata proxy.</td>
</tr>
+ <tr>
+ <td><option>external_ingress_mark</option> = <replaceable>0x2</replaceable></td>
+ <td>(StrOpt) Iptables mangle mark used to mark ingress from external network</td>
+ </tr>
<tr>
<td><option>external_network_bridge</option> = <replaceable>br-ex</replaceable></td>
<td>(StrOpt) Name of bridge used for external network traffic.</td>
@@ -55,12 +59,16 @@
</tr>
<tr>
<td><option>ha_vrrp_auth_type</option> = <replaceable>PASS</replaceable></td>
- <td>(StrOpt) VRRP authentication type AH/PASS</td>
+ <td>(StrOpt) VRRP authentication type</td>
</tr>
<tr>
<td><option>handle_internal_only_routers</option> = <replaceable>True</replaceable></td>
<td>(BoolOpt) Agent should implement routers with no gateway</td>
</tr>
+ <tr>
+ <td><option>ipv6_gateway</option> = <replaceable></replaceable></td>
+ <td>(StrOpt) With IPv6, the network used for the external gateway does not need to have an associated subnet, since the automatically assigned link-local address (LLA) can be used. However, an IPv6 gateway address is needed for use as the next-hop for the default route. If no IPv6 gateway address is configured here, (and only then) the neutron router will be configured to get its default route from router advertisements (RAs) from the upstream router; in which case the upstream router must also be configured to send these RAs. The ipv6_gateway, when configured, should be the LLA of the interface on the upstream router. If a next-hop using a global unique address (GUA) is desired, it needs to be done via a subnet allocated to the network and not through this parameter.</td>
+ </tr>
<tr>
<td><option>l3_ha</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Enable HA mode for virtual routers.</td>
diff --git a/doc/common/tables/neutron-l3_arista.xml b/doc/common/tables/neutron-l3_arista.xml
index 5195d58a73..6cdd231679 100644
--- a/doc/common/tables/neutron-l3_arista.xml
+++ b/doc/common/tables/neutron-l3_arista.xml
@@ -43,7 +43,7 @@
</tr>
<tr>
<td><option>use_vrf</option> = <replaceable>False</replaceable></td>
- <td>(BoolOpt) A "True" value for this flag indicates to create a router in VRF. If not set, all routers are created in default VRF.This is optional. If not set, a value of "False" is assumed.</td>
+ <td>(BoolOpt) A "True" value for this flag indicates to create a router in VRF. If not set, all routers are created in default VRF. This is optional. If not set, a value of "False" is assumed.</td>
</tr>
</tbody>
</table>
diff --git a/doc/common/tables/neutron-linuxbridge_agent.xml b/doc/common/tables/neutron-linuxbridge_agent.xml
index c26a30f845..034dfd0089 100644
--- a/doc/common/tables/neutron-linuxbridge_agent.xml
+++ b/doc/common/tables/neutron-linuxbridge_agent.xml
@@ -36,7 +36,7 @@
<th colspan="2">[VXLAN]</th>
</tr>
<tr>
- <td><option>enable_vxlan</option> = <replaceable>False</replaceable></td>
+ <td><option>enable_vxlan</option> = <replaceable>True</replaceable></td>
<td>(BoolOpt) Enable VXLAN on the agent. Can be enabled when agent is managed by ml2 plugin using linuxbridge mechanism driver</td>
</tr>
<tr>
diff --git a/doc/common/tables/neutron-logging.xml b/doc/common/tables/neutron-logging.xml
index 657862ff39..bbc5bbbd4d 100644
--- a/doc/common/tables/neutron-logging.xml
+++ b/doc/common/tables/neutron-logging.xml
@@ -22,7 +22,7 @@
<td>(BoolOpt) Print debugging output (set logging level to DEBUG instead of default WARNING level).</td>
</tr>
<tr>
- <td><option>default_log_levels</option> = <replaceable>amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN</replaceable></td>
+ <td><option>default_log_levels</option> = <replaceable>amqp=WARN, amqplib=WARN, boto=WARN, qpid=WARN, sqlalchemy=WARN, suds=INFO, oslo.messaging=INFO, iso8601=WARN, requests.packages.urllib3.connectionpool=WARN, urllib3.connectionpool=WARN, websocket=WARN, requests.packages.urllib3.util.retry=WARN, urllib3.util.retry=WARN, keystonemiddleware=WARN, routes.middleware=WARN, stevedore=WARN</replaceable></td>
<td>(ListOpt) List of logger=LEVEL pairs.</td>
</tr>
<tr>
@@ -57,6 +57,26 @@
<td><option>log_format</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) DEPRECATED. A logging.Formatter log message format string which may use any of the available logging.LogRecord attributes. This option is deprecated. Please use logging_context_format_string and logging_default_format_string instead.</td>
</tr>
+ <tr>
+ <td><option>log_config_append</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) The name of a logging configuration file. This file is appended to any existing logging configuration files. For details about logging configuration files, see the Python logging module documentation.</td>
+ </tr>
+ <tr>
+ <td><option>log_date_format</option> = <replaceable>%Y-%m-%d %H:%M:%S</replaceable></td>
+ <td>(StrOpt) Format string for %%(asctime)s in log records. Default: %(default)s .</td>
+ </tr>
+ <tr>
+ <td><option>log_dir</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) (Optional) The base directory used for relative --log-file paths.</td>
+ </tr>
+ <tr>
+ <td><option>log_file</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) (Optional) Name of log file to output to. If no default is set, logging will go to stdout.</td>
+ </tr>
+ <tr>
+ <td><option>log_format</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) DEPRECATED. A logging.Formatter log message format string which may use any of the available logging.LogRecord attributes. This option is deprecated. Please use logging_context_format_string and logging_default_format_string instead.</td>
+ </tr>
<tr>
<td><option>logging_context_format_string</option> = <replaceable>%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s</replaceable></td>
<td>(StrOpt) Format string to use for log messages with context.</td>
@@ -81,6 +101,18 @@
<td><option>syslog_log_facility</option> = <replaceable>LOG_USER</replaceable></td>
<td>(StrOpt) Syslog facility to receive log lines.</td>
</tr>
+ <tr>
+ <td><option>syslog_log_facility</option> = <replaceable>LOG_USER</replaceable></td>
+ <td>(StrOpt) Syslog facility to receive log lines.</td>
+ </tr>
+ <tr>
+ <td><option>use_syslog</option> = <replaceable>False</replaceable></td>
+ <td>(BoolOpt) Use syslog for logging. Existing syslog format is DEPRECATED during I, and will change in J to honor RFC5424.</td>
+ </tr>
+ <tr>
+ <td><option>use_syslog_rfc_format</option> = <replaceable>False</replaceable></td>
+ <td>(BoolOpt) (Optional) Enables or disables syslog rfc5424 format for logging. If enabled, prefixes the MSG part of the syslog message with APP-NAME (RFC5424). The format without the APP-NAME is deprecated in I, and will be removed in J.</td>
+ </tr>
<tr>
<td><option>use_ssl</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Enable SSL on the API server</td>
diff --git a/doc/common/tables/neutron-metadata.xml b/doc/common/tables/neutron-metadata.xml
index b1df5c0fbc..1b1892a30f 100644
--- a/doc/common/tables/neutron-metadata.xml
+++ b/doc/common/tables/neutron-metadata.xml
@@ -35,7 +35,7 @@
</tr>
<tr>
<td><option>metadata_proxy_group</option> = <replaceable></replaceable></td>
- <td>(StrOpt) Group (gid or name) running metadata proxy after its initialization (if empty: L3 agent effective group)</td>
+ <td>(StrOpt) Group (gid or name) running metadata proxy after its initialization (if empty: agent effective group).</td>
</tr>
<tr>
<td><option>metadata_proxy_shared_secret</option> = <replaceable></replaceable></td>
@@ -43,15 +43,23 @@
</tr>
<tr>
<td><option>metadata_proxy_socket</option> = <replaceable>$state_path/metadata_proxy</replaceable></td>
- <td>(StrOpt) Location of Metadata Proxy UNIX domain socket</td>
+ <td>(StrOpt) Location for Metadata Proxy UNIX domain socket.</td>
+ </tr>
+ <tr>
+ <td><option>metadata_proxy_socket_mode</option> = <replaceable>deduce</replaceable></td>
+ <td>(StrOpt) Metadata Proxy UNIX domain socket mode, 3 values allowed: 'deduce': deduce mode from metadata_proxy_user/group values, 'user': set metadata proxy socket mode to 0o644, to use when metadata_proxy_user is agent effective user or root, 'group': set metadata proxy socket mode to 0o664, to use when metadata_proxy_group is agent effective group or root, 'all': set metadata proxy socket mode to 0o666, to use otherwise.</td>
</tr>
<tr>
<td><option>metadata_proxy_user</option> = <replaceable></replaceable></td>
- <td>(StrOpt) User (uid or name) running metadata proxy after its initialization (if empty: L3 agent effective user)</td>
+ <td>(StrOpt) User (uid or name) running metadata proxy after its initialization (if empty: agent effective user).</td>
</tr>
<tr>
- <td><option>metadata_workers</option> = <replaceable>1</replaceable></td>
- <td>(IntOpt) Number of separate worker processes for metadata server</td>
+ <td><option>metadata_proxy_watch_log</option> = <replaceable>None</replaceable></td>
+ <td>(BoolOpt) Enable/Disable log watch by metadata proxy. It should be disabled when metadata_proxy_user/group is not allowed to read/write its log file and copytruncate logrotate option must be used if logrotate is enabled on metadata proxy log files. Option default value is deduced from metadata_proxy_user: watch log is enabled if metadata_proxy_user is agent effective user id/name.</td>
+ </tr>
+ <tr>
+ <td><option>metadata_workers</option> = <replaceable>2</replaceable></td>
+ <td>(IntOpt) Number of separate worker processes for metadata server (defaults to half of the number of CPUs)</td>
</tr>
<tr>
<td><option>nova_metadata_insecure</option> = <replaceable>False</replaceable></td>
diff --git a/doc/common/tables/neutron-midonet.xml b/doc/common/tables/neutron-midonet.xml
index 27c412ec08..3ae3d3d289 100644
--- a/doc/common/tables/neutron-midonet.xml
+++ b/doc/common/tables/neutron-midonet.xml
@@ -18,32 +18,20 @@
<th colspan="2">[MIDONET]</th>
</tr>
<tr>
- <td><option>midonet_host_uuid_path</option> = <replaceable>/etc/midolman/host_uuid.properties</replaceable></td>
- <td>(StrOpt) Path to midonet host uuid file</td>
+ <td><option>cluster_ip</option> = <replaceable>localhost</replaceable></td>
+ <td>(StrOpt) IP that the cluster service can be reached on</td>
</tr>
<tr>
- <td><option>midonet_uri</option> = <replaceable>http://localhost:8080/midonet-api</replaceable></td>
- <td>(StrOpt) MidoNet API server URI.</td>
+ <td><option>cluster_port</option> = <replaceable>8088</replaceable></td>
+ <td>(StrOpt) Port that the cluster service can be reached on</td>
</tr>
<tr>
- <td><option>mode</option> = <replaceable>dev</replaceable></td>
- <td>(StrOpt) Operational mode. Internal dev use only.</td>
+ <td><option>tunnel_protocol</option> = <replaceable>vxlan</replaceable></td>
+ <td>(StrOpt) Tunnel protocol used by Midonet</td>
</tr>
<tr>
- <td><option>password</option> = <replaceable>passw0rd</replaceable></td>
- <td>(StrOpt) MidoNet admin password.</td>
- </tr>
- <tr>
- <td><option>project_id</option> = <replaceable>77777777-7777-7777-7777-777777777777</replaceable></td>
- <td>(StrOpt) ID of the project that MidoNet admin userbelongs to.</td>
- </tr>
- <tr>
- <td><option>provider_router_id</option> = <replaceable>None</replaceable></td>
- <td>(StrOpt) Virtual provider router ID.</td>
- </tr>
- <tr>
- <td><option>username</option> = <replaceable>admin</replaceable></td>
- <td>(StrOpt) MidoNet admin username.</td>
+ <td><option>use_cluster</option> = <replaceable>False</replaceable></td>
+ <td>(BoolOpt) Use the midonet plugin that interacts with the tasks-based architecture, rather than the plugin that interacts with the HTTP based architecture.</td>
</tr>
</tbody>
</table>
diff --git a/doc/common/tables/neutron-ml2.xml b/doc/common/tables/neutron-ml2.xml
index 2f3a314556..d7e53171cd 100644
--- a/doc/common/tables/neutron-ml2.xml
+++ b/doc/common/tables/neutron-ml2.xml
@@ -21,10 +21,26 @@
<td><option>extension_drivers</option> = <replaceable></replaceable></td>
<td>(ListOpt) An ordered list of extension driver entrypoints to be loaded from the neutron.ml2.extension_drivers namespace.</td>
</tr>
+ <tr>
+ <td><option>external_network_type</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Default network type for external networks when no provider attributes are specified. By default it is None, which means that if provider attributes are not specified while creating external networks then they will have the same type as tenant networks. Allowed values for external_network_type config option depend on the network type values configured in type_drivers config option.</td>
+ </tr>
<tr>
<td><option>mechanism_drivers</option> = <replaceable></replaceable></td>
<td>(ListOpt) An ordered list of networking mechanism driver entrypoints to be loaded from the neutron.ml2.mechanism_drivers namespace.</td>
</tr>
+ <tr>
+ <td><option>path_mtu</option> = <replaceable>0</replaceable></td>
+ <td>(IntOpt) The maximum permissible size of an unfragmented packet travelling from and to addresses where encapsulated Neutron traffic is sent. If <= 0, the path MTU is indeterminate.</td>
+ </tr>
+ <tr>
+ <td><option>physical_network_mtus</option> = <replaceable></replaceable></td>
+ <td>(ListOpt) A list of mappings of physical networks to MTU values. The format of the mapping is <physnet>:<mtu val>. This mapping allows specifying a physical network MTU value that differs from the default segment_mtu value.</td>
+ </tr>
+ <tr>
+ <td><option>segment_mtu</option> = <replaceable>0</replaceable></td>
+ <td>(IntOpt) The maximum permissible size of an unfragmented packet travelling a L2 network segment. If <= 0, the segment MTU is indeterminate.</td>
+ </tr>
<tr>
<td><option>tenant_network_types</option> = <replaceable>local</replaceable></td>
<td>(ListOpt) Ordered list of network_types to allocate as tenant networks.</td>
diff --git a/doc/common/tables/neutron-ml2_arista.xml b/doc/common/tables/neutron-ml2_arista.xml
index 50831d489a..b5c588b15e 100644
--- a/doc/common/tables/neutron-ml2_arista.xml
+++ b/doc/common/tables/neutron-ml2_arista.xml
@@ -19,7 +19,7 @@
</tr>
<tr>
<td><option>eapi_host</option> = <replaceable></replaceable></td>
- <td>(StrOpt) Arista EOS IP address. This is required field. If not set, all communications to Arista EOSwill fail.</td>
+ <td>(StrOpt) Arista EOS IP address. This is required field. If not set, all communications to Arista EOS will fail.</td>
</tr>
<tr>
<td><option>eapi_password</option> = <replaceable></replaceable></td>
@@ -27,7 +27,7 @@
</tr>
<tr>
<td><option>eapi_username</option> = <replaceable></replaceable></td>
- <td>(StrOpt) Username for Arista EOS. This is required field. If not set, all communications to Arista EOSwill fail.</td>
+ <td>(StrOpt) Username for Arista EOS. This is required field. If not set, all communications to Arista EOS will fail.</td>
</tr>
<tr>
<td><option>region_name</option> = <replaceable>RegionOne</replaceable></td>
diff --git a/doc/common/tables/neutron-ml2_bigswitch.xml b/doc/common/tables/neutron-ml2_bigswitch.xml
index d648e61b0b..9a952d8c70 100644
--- a/doc/common/tables/neutron-ml2_bigswitch.xml
+++ b/doc/common/tables/neutron-ml2_bigswitch.xml
@@ -82,7 +82,7 @@
<td>(ListOpt) Nova compute nodes to manually set VIF type to vrouter</td>
</tr>
<tr>
- <td><option>vif_type</option> = <replaceable>ovs</replaceable></td>
+ <td><option>vif_type</option> = <replaceable>ivs</replaceable></td>
<td>(StrOpt) Virtual interface type to configure on Nova compute nodes</td>
</tr>
<tr>
@@ -109,7 +109,7 @@
<td>(IntOpt) Time between verifications that the backend controller database is consistent with Neutron. (0 to disable)</td>
</tr>
<tr>
- <td><option>neutron_id</option> = <replaceable>neutron-shock</replaceable></td>
+ <td><option>neutron_id</option> = <replaceable>neutron-images</replaceable></td>
<td>(StrOpt) User defined identifier for this Neutron deployment</td>
</tr>
<tr>
@@ -160,7 +160,7 @@
<td>(IntOpt) Seconds between agent checks for port changes</td>
</tr>
<tr>
- <td><option>virtual_switch_type</option> = <replaceable>ovs</replaceable></td>
+ <td><option>virtual_switch_type</option> = <replaceable>ivs</replaceable></td>
<td>(StrOpt) Virtual switch type.</td>
</tr>
<tr>
diff --git a/doc/common/tables/neutron-ml2_cisco.xml b/doc/common/tables/neutron-ml2_cisco.xml
index c866ac9d14..d14121fd52 100644
--- a/doc/common/tables/neutron-ml2_cisco.xml
+++ b/doc/common/tables/neutron-ml2_cisco.xml
@@ -21,6 +21,53 @@
<td><option>apic_system_id</option> = <replaceable>openstack</replaceable></td>
<td>(StrOpt) Prefix for APIC domain/names/profiles created</td>
</tr>
+ <tr>
+ <th colspan="2">[ml2_cisco]</th>
+ </tr>
+ <tr>
+ <td><option>host_key_checks</option> = <replaceable>False</replaceable></td>
+ <td>(BoolOpt) Enable strict host key checks when connecting to Nexus switches</td>
+ </tr>
+ <tr>
+ <td><option>managed_physical_network</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) The physical network managed by the switches.</td>
+ </tr>
+ <tr>
+ <td><option>persistent_switch_config</option> = <replaceable>False</replaceable></td>
+ <td>(BoolOpt) To make Nexus configuration persistent</td>
+ </tr>
+ <tr>
+ <td><option>provider_vlan_auto_create</option> = <replaceable>True</replaceable></td>
+ <td>(BoolOpt) Provider VLANs are automatically created as needed on the Nexus switch</td>
+ </tr>
+ <tr>
+ <td><option>provider_vlan_auto_trunk</option> = <replaceable>True</replaceable></td>
+ <td>(BoolOpt) Provider VLANs are automatically trunked as needed on the ports of the Nexus switch</td>
+ </tr>
+ <tr>
+ <td><option>provider_vlan_name_prefix</option> = <replaceable>p-</replaceable></td>
+ <td>(StrOpt) VLAN Name prefix for provider vlans</td>
+ </tr>
+ <tr>
+ <td><option>svi_round_robin</option> = <replaceable>False</replaceable></td>
+ <td>(BoolOpt) Distribute SVI interfaces over all switches</td>
+ </tr>
+ <tr>
+ <td><option>switch_heartbeat_time</option> = <replaceable>0</replaceable></td>
+ <td>(IntOpt) Periodic time to check switch connection. (0=disabled)</td>
+ </tr>
+ <tr>
+ <td><option>switch_replay_count</option> = <replaceable>3</replaceable></td>
+ <td>(IntOpt) Number of times to attempt config replay with switch.</td>
+ </tr>
+ <tr>
+ <td><option>vlan_name_prefix</option> = <replaceable>q-</replaceable></td>
+ <td>(StrOpt) VLAN Name prefix</td>
+ </tr>
+ <tr>
+ <td><option>vxlan_global_config</option> = <replaceable>False</replaceable></td>
+ <td>(BoolOpt) Create and delete Nexus switch VXLAN global settings; feature nv overlay, feature vn-segment-vlan-based, interface nve + source-interface loopback</td>
+ </tr>
<tr>
<th colspan="2">[ml2_cisco_apic]</th>
</tr>
@@ -96,6 +143,76 @@
<td><option>apic_vpc_pairs</option> = <replaceable></replaceable></td>
<td>(ListOpt) The switch pairs for VPC connectivity</td>
</tr>
+ <tr>
+ <th colspan="2">[ml2_cisco_n1kv]</th>
+ </tr>
+ <tr>
+ <td><option>default_policy_profile</option> = <replaceable>default-pp</replaceable></td>
+ <td>(StrOpt) Cisco Nexus1000V default policy profile.</td>
+ </tr>
+ <tr>
+ <td><option>default_vlan_network_profile</option> = <replaceable>default-vlan-np</replaceable></td>
+ <td>(StrOpt) Cisco Nexus1000V default network profile for VLAN networks.</td>
+ </tr>
+ <tr>
+ <td><option>default_vxlan_network_profile</option> = <replaceable>default-vxlan-np</replaceable></td>
+ <td>(StrOpt) Cisco Nexus1000V default network profile for VXLAN networks.</td>
+ </tr>
+ <tr>
+ <td><option>http_pool_size</option> = <replaceable>4</replaceable></td>
+ <td>(IntOpt) Number of threads to use to make HTTP requests.</td>
+ </tr>
+ <tr>
+ <td><option>http_timeout</option> = <replaceable>15</replaceable></td>
+ <td>(IntOpt) HTTP timeout, in seconds, for connections to the Cisco Nexus1000V VSMs.</td>
+ </tr>
+ <tr>
+ <td><option>n1kv_vsm_ips</option> = <replaceable>None</replaceable></td>
+ <td>(ListOpt) Comma Separated IP Addresses of the Cisco Nexus1000V VSMs.</td>
+ </tr>
+ <tr>
+ <td><option>password</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Password for all configured Cisco Nexus1000V VSMs.</td>
+ </tr>
+ <tr>
+ <td><option>poll_duration</option> = <replaceable>60</replaceable></td>
+ <td>(IntOpt) Cisco Nexus1000V policy profile polling duration in seconds.</td>
+ </tr>
+ <tr>
+ <td><option>restrict_policy_profiles</option> = <replaceable>False</replaceable></td>
+ <td>(BoolOpt) Restrict the visibility of policy profiles to the tenants.</td>
+ </tr>
+ <tr>
+ <td><option>sync_interval</option> = <replaceable>300</replaceable></td>
+ <td>(IntOpt) Time interval between consecutive neutron-VSM syncs.</td>
+ </tr>
+ <tr>
+ <td><option>username</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Username for all configured Cisco Nexus1000V VSMs.</td>
+ </tr>
+ <tr>
+ <th colspan="2">[ml2_cisco_ucsm]</th>
+ </tr>
+ <tr>
+ <td><option>supported_pci_devs</option> = <replaceable>1137:0071, 8086:10c9</replaceable></td>
+ <td>(ListOpt) List of comma separated vendor_id:product_id of SR_IOV capable devices supported by this MD. This MD supports both VM-FEX and SR-IOV devices.</td>
+ </tr>
+ <tr>
+ <td><option>ucsm_host_list</option> = <replaceable>None</replaceable></td>
+ <td>(ListOpt) List of comma separated Host:Service Profile tuples providing the Service Profile associated with each Host to be supported by this MD.</td>
+ </tr>
+ <tr>
+ <td><option>ucsm_ip</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Cisco UCS Manager IP address. This is a required field to communicate with a Cisco UCS Manager.</td>
+ </tr>
+ <tr>
+ <td><option>ucsm_password</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Password for UCS Manager. This is a required field to communicate with a Cisco UCS Manager.</td>
+ </tr>
+ <tr>
+ <td><option>ucsm_username</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Username for UCS Manager. This is a required field to communicate with a Cisco UCS Manager.</td>
+ </tr>
</tbody>
</table>
</para>
diff --git a/doc/common/tables/neutron-ml2_mlnx.xml b/doc/common/tables/neutron-ml2_mlnx.xml
index 2caa8ac600..651dc46685 100644
--- a/doc/common/tables/neutron-ml2_mlnx.xml
+++ b/doc/common/tables/neutron-ml2_mlnx.xml
@@ -17,6 +17,26 @@
<tr>
<th colspan="2">[ESWITCH]</th>
</tr>
+ <tr>
+ <td><option>backoff_rate</option> = <replaceable>2</replaceable></td>
+ <td>(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</td>
+ </tr>
+ <tr>
+ <td><option>daemon_endpoint</option> = <replaceable>tcp://127.0.0.1:60001</replaceable></td>
+ <td>(StrOpt) eswitch daemon end point</td>
+ </tr>
+ <tr>
+ <td><option>physical_interface_mappings</option> = <replaceable></replaceable></td>
+ <td>(ListOpt) List of <physical_network>:<physical_interface></td>
+ </tr>
+ <tr>
+ <td><option>request_timeout</option> = <replaceable>3000</replaceable></td>
+ <td>(IntOpt) The number of milliseconds the agent will wait for response on request to daemon.</td>
+ </tr>
+ <tr>
+ <td><option>retries</option> = <replaceable>3</replaceable></td>
+ <td>(IntOpt) The number of retries the agent will send request to daemon before giving up</td>
+ </tr>
<tr>
<td><option>vnic_type</option> = <replaceable>mlnx_direct</replaceable></td>
<td>(StrOpt) Type of VM network interface: mlnx_direct or hostdev</td>
diff --git a/doc/common/tables/neutron-ml2_ofa.xml b/doc/common/tables/neutron-ml2_ofa.xml
index 4b0fd3b2c9..c210d5fa24 100644
--- a/doc/common/tables/neutron-ml2_ofa.xml
+++ b/doc/common/tables/neutron-ml2_ofa.xml
@@ -14,21 +14,6 @@
</tr>
</thead>
<tbody>
- <tr>
- <th colspan="2">[DEFAULT]</th>
- </tr>
- <tr>
- <td><option>ofp_listen_host</option> = <replaceable></replaceable></td>
- <td>(StrOpt) openflow listen host</td>
- </tr>
- <tr>
- <td><option>ofp_ssl_listen_port</option> = <replaceable>6633</replaceable></td>
- <td>(IntOpt) openflow ssl listen port</td>
- </tr>
- <tr>
- <td><option>ofp_tcp_listen_port</option> = <replaceable>6633</replaceable></td>
- <td>(IntOpt) openflow tcp listen port</td>
- </tr>
<tr>
<th colspan="2">[AGENT]</th>
</tr>
@@ -36,14 +21,6 @@
<td><option>dont_fragment</option> = <replaceable>True</replaceable></td>
<td>(BoolOpt) Set or un-set the don't fragment (DF) bit on outgoing IP packet carrying GRE/VXLAN tunnel.</td>
</tr>
- <tr>
- <td><option>get_datapath_retry_times</option> = <replaceable>60</replaceable></td>
- <td>(IntOpt) Number of seconds to retry acquiring an Open vSwitch datapath</td>
- </tr>
- <tr>
- <td><option>physical_interface_mappings</option> = <replaceable></replaceable></td>
- <td>(ListOpt) List of <physical_network>:<physical_interface></td>
- </tr>
</tbody>
</table>
</para>
diff --git a/doc/common/tables/neutron-ml2_vxlan.xml b/doc/common/tables/neutron-ml2_vxlan.xml
index ae6e19c392..590154a3cd 100644
--- a/doc/common/tables/neutron-ml2_vxlan.xml
+++ b/doc/common/tables/neutron-ml2_vxlan.xml
@@ -14,6 +14,17 @@
</tr>
</thead>
<tbody>
+ <tr>
+ <th colspan="2">[ml2_type_nexus_vxlan]</th>
+ </tr>
+ <tr>
+ <td><option>mcast_ranges</option> = <replaceable></replaceable></td>
+ <td>(ListOpt) List of multicast groups to be used for global VNIDsin the format - a:b,c,e:f.</td>
+ </tr>
+ <tr>
+ <td><option>vni_ranges</option> = <replaceable></replaceable></td>
+ <td>(ListOpt) List of global VNID ranges in the format - a:b, c:d.Multiple ranges can be separated by a comma</td>
+ </tr>
<tr>
<th colspan="2">[ml2_type_vxlan]</th>
</tr>
diff --git a/doc/common/tables/neutron-nova.xml b/doc/common/tables/neutron-nova.xml
new file mode 100644
index 0000000000..2629d7503e
--- /dev/null
+++ b/doc/common/tables/neutron-nova.xml
@@ -0,0 +1,54 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<para xmlns="http://docbook.org/ns/docbook" version="5.0">
+ <!-- Warning: Do not edit this file. It is automatically
+ generated and your changes will be overwritten.
+ The tool to do so lives in openstack-doc-tools repository. -->
+ <table rules="all" xml:id="config_table_neutron_nova">
+ <caption>Description of nova configuration options</caption>
+ <col width="50%"/>
+ <col width="50%"/>
+ <thead>
+ <tr>
+ <th>Configuration option = Default value</th>
+ <th>Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <th colspan="2">[nova]</th>
+ </tr>
+ <tr>
+ <td><option>auth_plugin</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Name of the plugin to load</td>
+ </tr>
+ <tr>
+ <td><option>auth_section</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Config Section from which to load plugin specific options</td>
+ </tr>
+ <tr>
+ <td><option>cafile</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) PEM encoded Certificate Authority to use when verifying HTTPs connections.</td>
+ </tr>
+ <tr>
+ <td><option>certfile</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) PEM encoded client certificate cert file</td>
+ </tr>
+ <tr>
+ <td><option>insecure</option> = <replaceable>False</replaceable></td>
+ <td>(BoolOpt) Verify HTTPS connections.</td>
+ </tr>
+ <tr>
+ <td><option>keyfile</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) PEM encoded client certificate key file</td>
+ </tr>
+ <tr>
+ <td><option>region_name</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Name of nova region to use. Useful if keystone manages more than one region.</td>
+ </tr>
+ <tr>
+ <td><option>timeout</option> = <replaceable>None</replaceable></td>
+ <td>(IntOpt) Timeout value for http requests</td>
+ </tr>
+ </tbody>
+ </table>
+</para>
diff --git a/doc/common/tables/neutron-nsx.xml b/doc/common/tables/neutron-nsx.xml
new file mode 100644
index 0000000000..ef2f53453f
--- /dev/null
+++ b/doc/common/tables/neutron-nsx.xml
@@ -0,0 +1,222 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<para xmlns="http://docbook.org/ns/docbook" version="5.0">
+ <!-- Warning: Do not edit this file. It is automatically
+ generated and your changes will be overwritten.
+ The tool to do so lives in openstack-doc-tools repository. -->
+ <table rules="all" xml:id="config_table_neutron_nsx">
+ <caption>Description of VMware NSX configuration options</caption>
+ <col width="50%"/>
+ <col width="50%"/>
+ <thead>
+ <tr>
+ <th>Configuration option = Default value</th>
+ <th>Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <th colspan="2">[DEFAULT]</th>
+ </tr>
+ <tr>
+ <td><option>conn_idle_timeout</option> = <replaceable>900</replaceable></td>
+ <td>(IntOpt) Reconnect connection to nsx if not used within this amount of time.</td>
+ </tr>
+ <tr>
+ <td><option>default_service_cluster_uuid</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Unique identifier of the Service Cluster which will be used by logical services like dhcp and metadata</td>
+ </tr>
+ <tr>
+ <td><option>default_tz_uuid</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) This is uuid of the default NSX Transport zone that will be used for creating tunneled isolated "Neutron" networks. It needs to be created in NSX before starting Neutron with the nsx plugin.</td>
+ </tr>
+ <tr>
+ <td><option>http_timeout</option> = <replaceable>75</replaceable></td>
+ <td>(IntOpt) Time before aborting a request</td>
+ </tr>
+ <tr>
+ <td><option>nsx_controllers</option> = <replaceable>None</replaceable></td>
+ <td>(ListOpt) Lists the NSX controllers in this cluster</td>
+ </tr>
+ <tr>
+ <td><option>nsx_password</option> = <replaceable>admin</replaceable></td>
+ <td>(StrOpt) Password for NSX controllers in this cluster</td>
+ </tr>
+ <tr>
+ <td><option>nsx_user</option> = <replaceable>admin</replaceable></td>
+ <td>(StrOpt) User name for NSX controllers in this cluster</td>
+ </tr>
+ <tr>
+ <td><option>redirects</option> = <replaceable>2</replaceable></td>
+ <td>(IntOpt) Number of times a redirect should be followed</td>
+ </tr>
+ <tr>
+ <td><option>retries</option> = <replaceable>2</replaceable></td>
+ <td>(IntOpt) Number of time a request should be retried</td>
+ </tr>
+ <tr>
+ <th colspan="2">[NSX]</th>
+ </tr>
+ <tr>
+ <td><option>agent_mode</option> = <replaceable>agent</replaceable></td>
+ <td>(StrOpt) The mode used to implement DHCP/metadata services.</td>
+ </tr>
+ <tr>
+ <td><option>concurrent_connections</option> = <replaceable>10</replaceable></td>
+ <td>(IntOpt) Maximum concurrent connections to each NSX controller.</td>
+ </tr>
+ <tr>
+ <td><option>default_transport_type</option> = <replaceable>stt</replaceable></td>
+ <td>(StrOpt) The default network tranport type to use (stt, gre, bridge, ipsec_gre, or ipsec_stt)</td>
+ </tr>
+ <tr>
+ <td><option>max_lp_per_bridged_ls</option> = <replaceable>5000</replaceable></td>
+ <td>(IntOpt) Maximum number of ports of a logical switch on a bridged transport zone (default 5000)</td>
+ </tr>
+ <tr>
+ <td><option>max_lp_per_overlay_ls</option> = <replaceable>256</replaceable></td>
+ <td>(IntOpt) Maximum number of ports of a logical switch on an overlay transport zone (default 256)</td>
+ </tr>
+ <tr>
+ <td><option>metadata_mode</option> = <replaceable>access_network</replaceable></td>
+ <td>(StrOpt) If set to access_network this enables a dedicated connection to the metadata proxy for metadata server access via Neutron router. If set to dhcp_host_route this enables host route injection via the dhcp agent. This option is only useful if running on a host that does not support namespaces otherwise access_network should be used.</td>
+ </tr>
+ <tr>
+ <td><option>nsx_gen_timeout</option> = <replaceable>-1</replaceable></td>
+ <td>(IntOpt) Number of seconds a generation id should be valid for (default -1 meaning do not time out)</td>
+ </tr>
+ <tr>
+ <td><option>replication_mode</option> = <replaceable>service</replaceable></td>
+ <td>(StrOpt) The default option leverages service nodes to perform packet replication though one could set to this to 'source' to perform replication locally. This is useful if one does not want to deploy a service node(s). It must be set to 'service' for leveraging distributed routers.</td>
+ </tr>
+ <tr>
+ <th colspan="2">[NSX_SYNC]</th>
+ </tr>
+ <tr>
+ <td><option>always_read_status</option> = <replaceable>False</replaceable></td>
+ <td>(BoolOpt) Always read operational status from backend on show operations. Enabling this option might slow down the system.</td>
+ </tr>
+ <tr>
+ <td><option>max_random_sync_delay</option> = <replaceable>0</replaceable></td>
+ <td>(IntOpt) Maximum value for the additional random delay in seconds between runs of the state synchronization task</td>
+ </tr>
+ <tr>
+ <td><option>min_chunk_size</option> = <replaceable>500</replaceable></td>
+ <td>(IntOpt) Minimum number of resources to be retrieved from NSX during state synchronization</td>
+ </tr>
+ <tr>
+ <td><option>min_sync_req_delay</option> = <replaceable>1</replaceable></td>
+ <td>(IntOpt) Minimum delay, in seconds, between two state synchronization queries to NSX. It must not exceed state_sync_interval</td>
+ </tr>
+ <tr>
+ <td><option>state_sync_interval</option> = <replaceable>10</replaceable></td>
+ <td>(IntOpt) Interval in seconds between runs of the state synchronization task. Set it to 0 to disable it</td>
+ </tr>
+ <tr>
+ <th colspan="2">[nsx_v3]</th>
+ </tr>
+ <tr>
+ <td><option>default_edge_cluster_uuid</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Default edge cluster identifier</td>
+ </tr>
+ <tr>
+ <th colspan="2">[nsxv]</th>
+ </tr>
+ <tr>
+ <td><option>backup_edge_pool</option> = <replaceable>service:large:4:10, service:compact:4:10, vdr:large:4:10</replaceable></td>
+ <td>(ListOpt) Defines edge pool using the format: <edge_type>:[edge_size]:<min_edges>:<max_edges>.edge_type: service,vdr. edge_size: compact, large, xlarge, quadlarge and default is large.</td>
+ </tr>
+ <tr>
+ <td><option>cluster_moid</option> = <replaceable></replaceable></td>
+ <td>(ListOpt) Parameter listing the IDs of the clusters which are used by OpenStack.</td>
+ </tr>
+ <tr>
+ <td><option>datacenter_moid</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Optional parameter identifying the ID of datacenter to deploy NSX Edges</td>
+ </tr>
+ <tr>
+ <td><option>datastore_id</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Optional parameter identifying the ID of datastore to deploy NSX Edges</td>
+ </tr>
+ <tr>
+ <td><option>deployment_container_id</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Optional parameter identifying the ID of datastore to deploy NSX Edges</td>
+ </tr>
+ <tr>
+ <td><option>dvs_id</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) DVS ID for VLANs</td>
+ </tr>
+ <tr>
+ <td><option>external_network</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Network ID for physical network connectivity</td>
+ </tr>
+ <tr>
+ <td><option>manager_uri</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) uri for vsm</td>
+ </tr>
+ <tr>
+ <td><option>maximum_tunnels_per_vnic</option> = <replaceable>20</replaceable></td>
+ <td>(IntOpt) Maximum number of sub interfaces supported per vnic in edge. The value should be in 1-110.</td>
+ </tr>
+ <tr>
+ <td><option>metadata_shared_secret</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Shared secret to sign metadata requests</td>
+ </tr>
+ <tr>
+ <td><option>mgt_net_default_gateway</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Management network default gateway for metadata proxy</td>
+ </tr>
+ <tr>
+ <td><option>mgt_net_moid</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Network ID for management network connectivity</td>
+ </tr>
+ <tr>
+ <td><option>mgt_net_proxy_ips</option> = <replaceable>None</replaceable></td>
+ <td>(ListOpt) Management network IP address for metadata proxy</td>
+ </tr>
+ <tr>
+ <td><option>mgt_net_proxy_netmask</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Management network netmask for metadata proxy</td>
+ </tr>
+ <tr>
+ <td><option>nova_metadata_ips</option> = <replaceable>None</replaceable></td>
+ <td>(ListOpt) IP addresses used by Nova metadata service</td>
+ </tr>
+ <tr>
+ <td><option>nova_metadata_port</option> = <replaceable>8775</replaceable></td>
+ <td>(IntOpt) TCP Port used by Nova metadata server</td>
+ </tr>
+ <tr>
+ <td><option>password</option> = <replaceable>default</replaceable></td>
+ <td>(StrOpt) Password for vsm</td>
+ </tr>
+ <tr>
+ <td><option>resource_pool_id</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Optional parameter identifying the ID of resource to deploy NSX Edges</td>
+ </tr>
+ <tr>
+ <td><option>retries</option> = <replaceable>10</replaceable></td>
+ <td>(IntOpt) Maximum number of API retries on endpoint.</td>
+ </tr>
+ <tr>
+ <td><option>spoofguard_enabled</option> = <replaceable>True</replaceable></td>
+ <td>(BoolOpt) If True then plugin will use NSXV spoofguard component for port-security feature.</td>
+ </tr>
+ <tr>
+ <td><option>task_status_check_interval</option> = <replaceable>2000</replaceable></td>
+ <td>(IntOpt) Task status check interval</td>
+ </tr>
+ <tr>
+ <td><option>tenant_router_types</option> = <replaceable>shared, distributed, exclusive</replaceable></td>
+ <td>(ListOpt) Ordered list of router_types to allocate as tenant routers.</td>
+ </tr>
+ <tr>
+ <td><option>user</option> = <replaceable>admin</replaceable></td>
+ <td>(StrOpt) User name for vsm</td>
+ </tr>
+ <tr>
+ <td><option>vdn_scope_id</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Network scope ID for VXLAN virtual wires</td>
+ </tr>
+ </tbody>
+ </table>
+</para>
diff --git a/doc/common/tables/neutron-openvswitch_agent.xml b/doc/common/tables/neutron-openvswitch_agent.xml
index 6c5d40094d..e7291983ed 100644
--- a/doc/common/tables/neutron-openvswitch_agent.xml
+++ b/doc/common/tables/neutron-openvswitch_agent.xml
@@ -56,6 +56,10 @@
<td><option>ovsdb_monitor_respawn_interval</option> = <replaceable>30</replaceable></td>
<td>(IntOpt) The number of seconds to wait before respawning the ovsdb monitor after losing communication with it.</td>
</tr>
+ <tr>
+ <td><option>prevent_arp_spoofing</option> = <replaceable>True</replaceable></td>
+ <td>(BoolOpt) Enable suppression of ARP responses that don't match an IP address that belongs to the port from which they originate. Note: This prevents the VMs attached to this agent from spoofing, it doesn't protect them from other devices which have the capability to spoof (e.g. bare metal or VMs attached to agents without this flag set to True). Spoofing rules will not be added to any ports that have port security disabled. This requires a version of OVS that supports matching ARP headers.</td>
+ </tr>
<tr>
<td><option>quitting_rpc_timeout</option> = <replaceable>10</replaceable></td>
<td>(IntOpt) Set new timeout in seconds for new rpc calls after agent receives SIGTERM. If value is set to 0, rpc timeout won't be changed</td>
diff --git a/doc/common/tables/neutron-plumgrid.xml b/doc/common/tables/neutron-plumgrid.xml
index afadfe146f..c52751948e 100644
--- a/doc/common/tables/neutron-plumgrid.xml
+++ b/doc/common/tables/neutron-plumgrid.xml
@@ -26,7 +26,7 @@
<td>(StrOpt) PLUMgrid Director server port to connect to</td>
</tr>
<tr>
- <td><option>driver</option> = <replaceable>neutron.plugins.plumgrid.drivers.plumlib.Plumlib</replaceable></td>
+ <td><option>driver</option> = <replaceable>networking_plumgrid.neutron.plugins.drivers.plumlib.Plumlib</replaceable></td>
<td>(StrOpt) PLUMgrid Driver</td>
</tr>
<tr>
diff --git a/doc/common/tables/neutron-policy.xml b/doc/common/tables/neutron-policy.xml
index aa1c582d8f..1f1011c5ff 100644
--- a/doc/common/tables/neutron-policy.xml
+++ b/doc/common/tables/neutron-policy.xml
@@ -27,7 +27,7 @@
</tr>
<tr>
<td><option>policy_dirs</option> = <replaceable>['policy.d']</replaceable></td>
- <td>(MultiStrOpt) Directories where policy configuration files are stored.</td>
+ <td>(MultiStrOpt) Directories where policy configuration files are stored. They can be relative to any directory in the search path defined by the config_dir option, or absolute paths. The file defined by policy_file must exist for these directories to be searched. Missing or empty directories are ignored.</td>
</tr>
<tr>
<td><option>policy_file</option> = <replaceable>policy.json</replaceable></td>
diff --git a/doc/common/tables/neutron-quotas.xml b/doc/common/tables/neutron-quotas.xml
index 3c7a9c6091..5870bda4a4 100644
--- a/doc/common/tables/neutron-quotas.xml
+++ b/doc/common/tables/neutron-quotas.xml
@@ -36,10 +36,18 @@
<td><option>quota_floatingip</option> = <replaceable>50</replaceable></td>
<td>(IntOpt) Number of floating IPs allowed per tenant. A negative value means unlimited.</td>
</tr>
+ <tr>
+ <td><option>quota_health_monitor</option> = <replaceable>-1</replaceable></td>
+ <td>(IntOpt) Number of health monitors allowed per tenant. A negative value means unlimited.</td>
+ </tr>
<tr>
<td><option>quota_items</option> = <replaceable>network, subnet, port</replaceable></td>
<td>(ListOpt) Resource name(s) that are supported in quota features</td>
</tr>
+ <tr>
+ <td><option>quota_member</option> = <replaceable>-1</replaceable></td>
+ <td>(IntOpt) Number of pool members allowed per tenant. A negative value means unlimited.</td>
+ </tr>
<tr>
<td><option>quota_network</option> = <replaceable>10</replaceable></td>
<td>(IntOpt) Number of networks allowed per tenant. A negative value means unlimited.</td>
@@ -52,6 +60,10 @@
<td><option>quota_packet_filter</option> = <replaceable>100</replaceable></td>
<td>(IntOpt) Number of packet_filters allowed per tenant, -1 for unlimited</td>
</tr>
+ <tr>
+ <td><option>quota_pool</option> = <replaceable>10</replaceable></td>
+ <td>(IntOpt) Number of pools allowed per tenant. A negative value means unlimited.</td>
+ </tr>
<tr>
<td><option>quota_port</option> = <replaceable>50</replaceable></td>
<td>(IntOpt) Number of ports allowed per tenant. A negative value means unlimited.</td>
@@ -72,6 +84,10 @@
<td><option>quota_subnet</option> = <replaceable>10</replaceable></td>
<td>(IntOpt) Number of subnets allowed per tenant, A negative value means unlimited.</td>
</tr>
+ <tr>
+ <td><option>quota_vip</option> = <replaceable>10</replaceable></td>
+ <td>(IntOpt) Number of vips allowed per tenant. A negative value means unlimited.</td>
+ </tr>
</tbody>
</table>
</para>
diff --git a/doc/common/tables/neutron-rpc.xml b/doc/common/tables/neutron-rpc.xml
index c02d28b78e..c54510e010 100644
--- a/doc/common/tables/neutron-rpc.xml
+++ b/doc/common/tables/neutron-rpc.xml
@@ -33,10 +33,6 @@
<td><option>rpc_cast_timeout</option> = <replaceable>30</replaceable></td>
<td>(IntOpt) Seconds to wait before a cast expires (TTL). Only supported by impl_zmq.</td>
</tr>
- <tr>
- <td><option>rpc_conn_pool_size</option> = <replaceable>30</replaceable></td>
- <td>(IntOpt) Size of RPC connection pool.</td>
- </tr>
<tr>
<td><option>rpc_response_timeout</option> = <replaceable>60</replaceable></td>
<td>(IntOpt) Seconds to wait for a response from a call.</td>
@@ -114,6 +110,160 @@
<td><option>trace</option> = <replaceable>False</replaceable></td>
<td>(BoolOpt) Debug: dump AMQP frames to stdout</td>
</tr>
+ <tr>
+ <th colspan="2">[oslo_messaging_qpid]</th>
+ </tr>
+ <tr>
+ <td><option>amqp_auto_delete</option> = <replaceable>False</replaceable></td>
+ <td>(BoolOpt) Auto-delete queues in AMQP.</td>
+ </tr>
+ <tr>
+ <td><option>amqp_durable_queues</option> = <replaceable>False</replaceable></td>
+ <td>(BoolOpt) Use durable queues in AMQP.</td>
+ </tr>
+ <tr>
+ <td><option>qpid_heartbeat</option> = <replaceable>60</replaceable></td>
+ <td>(IntOpt) Seconds between connection keepalive heartbeats.</td>
+ </tr>
+ <tr>
+ <td><option>qpid_hostname</option> = <replaceable>localhost</replaceable></td>
+ <td>(StrOpt) Qpid broker hostname.</td>
+ </tr>
+ <tr>
+ <td><option>qpid_hosts</option> = <replaceable>$qpid_hostname:$qpid_port</replaceable></td>
+ <td>(ListOpt) Qpid HA cluster host:port pairs.</td>
+ </tr>
+ <tr>
+ <td><option>qpid_password</option> = <replaceable></replaceable></td>
+ <td>(StrOpt) Password for Qpid connection.</td>
+ </tr>
+ <tr>
+ <td><option>qpid_port</option> = <replaceable>5672</replaceable></td>
+ <td>(IntOpt) Qpid broker port.</td>
+ </tr>
+ <tr>
+ <td><option>qpid_protocol</option> = <replaceable>tcp</replaceable></td>
+ <td>(StrOpt) Transport to use, either 'tcp' or 'ssl'.</td>
+ </tr>
+ <tr>
+ <td><option>qpid_receiver_capacity</option> = <replaceable>1</replaceable></td>
+ <td>(IntOpt) The number of prefetched messages held by receiver.</td>
+ </tr>
+ <tr>
+ <td><option>qpid_sasl_mechanisms</option> = <replaceable></replaceable></td>
+ <td>(StrOpt) Space separated list of SASL mechanisms to use for auth.</td>
+ </tr>
+ <tr>
+ <td><option>qpid_tcp_nodelay</option> = <replaceable>True</replaceable></td>
+ <td>(BoolOpt) Whether to disable the Nagle algorithm.</td>
+ </tr>
+ <tr>
+ <td><option>qpid_topology_version</option> = <replaceable>1</replaceable></td>
+ <td>(IntOpt) The qpid topology version to use. Version 1 is what was originally used by impl_qpid. Version 2 includes some backwards-incompatible changes that allow broker federation to work. Users should update to version 2 when they are able to take everything down, as it requires a clean break.</td>
+ </tr>
+ <tr>
+ <td><option>qpid_username</option> = <replaceable></replaceable></td>
+ <td>(StrOpt) Username for Qpid connection.</td>
+ </tr>
+ <tr>
+ <td><option>rpc_conn_pool_size</option> = <replaceable>30</replaceable></td>
+ <td>(IntOpt) Size of RPC connection pool.</td>
+ </tr>
+ <tr>
+ <th colspan="2">[oslo_messaging_rabbit]</th>
+ </tr>
+ <tr>
+ <td><option>amqp_auto_delete</option> = <replaceable>False</replaceable></td>
+ <td>(BoolOpt) Auto-delete queues in AMQP.</td>
+ </tr>
+ <tr>
+ <td><option>amqp_durable_queues</option> = <replaceable>False</replaceable></td>
+ <td>(BoolOpt) Use durable queues in AMQP.</td>
+ </tr>
+ <tr>
+ <td><option>fake_rabbit</option> = <replaceable>False</replaceable></td>
+ <td>(BoolOpt) Deprecated, use rpc_backend=kombu+memory or rpc_backend=fake</td>
+ </tr>
+ <tr>
+ <td><option>heartbeat_rate</option> = <replaceable>2</replaceable></td>
+ <td>(IntOpt) How often times during the heartbeat_timeout_threshold we check the heartbeat.</td>
+ </tr>
+ <tr>
+ <td><option>heartbeat_timeout_threshold</option> = <replaceable>60</replaceable></td>
+ <td>(IntOpt) Number of seconds after which the Rabbit broker is considered down if heartbeat's keep-alive fails (0 disable the heartbeat).</td>
+ </tr>
+ <tr>
+ <td><option>kombu_reconnect_delay</option> = <replaceable>1.0</replaceable></td>
+ <td>(FloatOpt) How long to wait before reconnecting in response to an AMQP consumer cancel notification.</td>
+ </tr>
+ <tr>
+ <td><option>kombu_ssl_ca_certs</option> = <replaceable></replaceable></td>
+ <td>(StrOpt) SSL certification authority file (valid only if SSL enabled).</td>
+ </tr>
+ <tr>
+ <td><option>kombu_ssl_certfile</option> = <replaceable></replaceable></td>
+ <td>(StrOpt) SSL cert file (valid only if SSL enabled).</td>
+ </tr>
+ <tr>
+ <td><option>kombu_ssl_keyfile</option> = <replaceable></replaceable></td>
+ <td>(StrOpt) SSL key file (valid only if SSL enabled).</td>
+ </tr>
+ <tr>
+ <td><option>kombu_ssl_version</option> = <replaceable></replaceable></td>
+ <td>(StrOpt) SSL version to use (valid only if SSL enabled). Valid values are TLSv1 and SSLv23. SSLv2, SSLv3, TLSv1_1, and TLSv1_2 may be available on some distributions.</td>
+ </tr>
+ <tr>
+ <td><option>rabbit_ha_queues</option> = <replaceable>False</replaceable></td>
+ <td>(BoolOpt) Use HA queues in RabbitMQ (x-ha-policy: all). If you change this option, you must wipe the RabbitMQ database.</td>
+ </tr>
+ <tr>
+ <td><option>rabbit_host</option> = <replaceable>localhost</replaceable></td>
+ <td>(StrOpt) The RabbitMQ broker address where a single node is used.</td>
+ </tr>
+ <tr>
+ <td><option>rabbit_hosts</option> = <replaceable>$rabbit_host:$rabbit_port</replaceable></td>
+ <td>(ListOpt) RabbitMQ HA cluster host:port pairs.</td>
+ </tr>
+ <tr>
+ <td><option>rabbit_login_method</option> = <replaceable>AMQPLAIN</replaceable></td>
+ <td>(StrOpt) The RabbitMQ login method.</td>
+ </tr>
+ <tr>
+ <td><option>rabbit_max_retries</option> = <replaceable>0</replaceable></td>
+ <td>(IntOpt) Maximum number of RabbitMQ connection retries. Default is 0 (infinite retry count).</td>
+ </tr>
+ <tr>
+ <td><option>rabbit_password</option> = <replaceable>guest</replaceable></td>
+ <td>(StrOpt) The RabbitMQ password.</td>
+ </tr>
+ <tr>
+ <td><option>rabbit_port</option> = <replaceable>5672</replaceable></td>
+ <td>(IntOpt) The RabbitMQ broker port where a single node is used.</td>
+ </tr>
+ <tr>
+ <td><option>rabbit_retry_backoff</option> = <replaceable>2</replaceable></td>
+ <td>(IntOpt) How long to backoff for between retries when connecting to RabbitMQ.</td>
+ </tr>
+ <tr>
+ <td><option>rabbit_retry_interval</option> = <replaceable>1</replaceable></td>
+ <td>(IntOpt) How frequently to retry connecting with RabbitMQ.</td>
+ </tr>
+ <tr>
+ <td><option>rabbit_use_ssl</option> = <replaceable>False</replaceable></td>
+ <td>(BoolOpt) Connect over SSL for RabbitMQ.</td>
+ </tr>
+ <tr>
+ <td><option>rabbit_userid</option> = <replaceable>guest</replaceable></td>
+ <td>(StrOpt) The RabbitMQ userid.</td>
+ </tr>
+ <tr>
+ <td><option>rabbit_virtual_host</option> = <replaceable>/</replaceable></td>
+ <td>(StrOpt) The RabbitMQ virtual host.</td>
+ </tr>
+ <tr>
+ <td><option>rpc_conn_pool_size</option> = <replaceable>30</replaceable></td>
+ <td>(IntOpt) Size of RPC connection pool.</td>
+ </tr>
</tbody>
</table>
</para>
diff --git a/doc/common/tables/neutron-securitygroups.xml b/doc/common/tables/neutron-securitygroups.xml
index 1a3800efff..bc0aa8999a 100644
--- a/doc/common/tables/neutron-securitygroups.xml
+++ b/doc/common/tables/neutron-securitygroups.xml
@@ -17,6 +17,10 @@
<tr>
<th colspan="2">[SECURITYGROUP]</th>
</tr>
+ <tr>
+ <td><option>defer_apply</option> = <replaceable>True</replaceable></td>
+ <td>(BoolOpt) Enable defer_apply on security bridge.</td>
+ </tr>
<tr>
<td><option>enable_ipset</option> = <replaceable>True</replaceable></td>
<td>(BoolOpt) Use ipset to speed-up the iptables based security groups.</td>
@@ -29,6 +33,14 @@
<td><option>firewall_driver</option> = <replaceable>None</replaceable></td>
<td>(StrOpt) Driver for security groups firewall in the L2 agent</td>
</tr>
+ <tr>
+ <td><option>ovsvapp_firewall_driver</option> = <replaceable>networking_vsphere.drivers.ovs_firewall.OVSFirewallDriver</replaceable></td>
+ <td>(StrOpt) DriverManager implementation for OVS based Firewall.</td>
+ </tr>
+ <tr>
+ <td><option>security_bridge_mapping</option> = <replaceable>br-sec</replaceable></td>
+ <td>(StrOpt) <security_bridge>:<phy_interface></td>
+ </tr>
</tbody>
</table>
</para>
diff --git a/doc/common/tables/neutron-vmware.xml b/doc/common/tables/neutron-vmware.xml
index fcdb7f66c8..4454cbfa9e 100644
--- a/doc/common/tables/neutron-vmware.xml
+++ b/doc/common/tables/neutron-vmware.xml
@@ -18,182 +18,94 @@
<th colspan="2">[DEFAULT]</th>
</tr>
<tr>
- <td><option>default_interface_name</option> = <replaceable>breth0</replaceable></td>
- <td>(StrOpt) Name of the interface on a L2 Gateway transport nodewhich should be used by default when setting up a network connection</td>
+ <td><option>default_interface_name</option> = <replaceable>FortyGigE1/0/1</replaceable></td>
+ <td>(StrOpt) default_interface_name of the l2 gateway</td>
</tr>
<tr>
- <td><option>default_l2_gw_service_uuid</option> = <replaceable>None</replaceable></td>
- <td>(StrOpt) Unique identifier of the NSX L2 Gateway service which will be used by default for network gateways</td>
+ <th colspan="2">[OVSVAPP]</th>
</tr>
<tr>
- <td><option>default_l3_gw_service_uuid</option> = <replaceable>None</replaceable></td>
- <td>(StrOpt) Unique identifier of the NSX L3 Gateway service which will be used for implementing routers and floating IPs</td>
+ <td><option>agent_driver</option> = <replaceable>networking_vsphere.agent.ovsvapp_agent.OVSvAppL2Agent</replaceable></td>
+ <td>(StrOpt) OVSvApp Agent implementation.</td>
</tr>
<tr>
- <td><option>default_service_cluster_uuid</option> = <replaceable>None</replaceable></td>
- <td>(StrOpt) Unique identifier of the Service Cluster which will be used by logical services like dhcp and metadata</td>
+ <td><option>agent_maintenance</option> = <replaceable>False</replaceable></td>
+ <td>(BoolOpt) Turn on this flag during agent updates to help prevent datapath outage.</td>
</tr>
<tr>
- <td><option>default_tz_uuid</option> = <replaceable>None</replaceable></td>
- <td>(StrOpt) This is uuid of the default NSX Transport zone that will be used for creating tunneled isolated "Neutron" networks. It needs to be created in NSX before starting Neutron with the nsx plugin.</td>
+ <td><option>bridge_mappings</option> = <replaceable></replaceable></td>
+ <td>(ListOpt) Bridge mappings.</td>
</tr>
<tr>
- <td><option>http_timeout</option> = <replaceable>75</replaceable></td>
- <td>(IntOpt) Time before aborting a request</td>
+ <td><option>integration_bridge</option> = <replaceable>br-int</replaceable></td>
+ <td>(StrOpt) Integration Bridge.</td>
</tr>
<tr>
- <td><option>nsx_controllers</option> = <replaceable>None</replaceable></td>
- <td>(ListOpt) Lists the NSX controllers in this cluster</td>
+ <td><option>network_manager</option> = <replaceable>networking_vsphere.drivers.manager.VcenterManager</replaceable></td>
+ <td>(StrOpt) Driver Manager implementation for NetworkDriver.</td>
</tr>
<tr>
- <td><option>nsx_password</option> = <replaceable>admin</replaceable></td>
- <td>(StrOpt) Password for NSX controllers in this cluster</td>
+ <td><option>polling_interval</option> = <replaceable>2</replaceable></td>
+ <td>(IntOpt) The number of seconds the agent will wait between polling for local device changes.</td>
</tr>
<tr>
- <td><option>nsx_user</option> = <replaceable>admin</replaceable></td>
- <td>(StrOpt) User name for NSX controllers in this cluster</td>
+ <td><option>report_interval</option> = <replaceable>4</replaceable></td>
+ <td>(IntOpt) Seconds between nodes reporting state to server.</td>
</tr>
<tr>
- <td><option>redirects</option> = <replaceable>2</replaceable></td>
- <td>(IntOpt) Number of times a redirect should be followed</td>
+ <td><option>tenant_network_type</option> = <replaceable>vlan</replaceable></td>
+ <td>(StrOpt) Network type for tenant networks - vlan.</td>
</tr>
<tr>
- <td><option>retries</option> = <replaceable>2</replaceable></td>
- <td>(IntOpt) Number of time a request should be retried</td>
+ <td><option>veth_mtu</option> = <replaceable>1500</replaceable></td>
+ <td>(IntOpt) MTU size of veth interfaces.</td>
</tr>
<tr>
- <th colspan="2">[NSX]</th>
+ <th colspan="2">[VMWARE]</th>
</tr>
<tr>
- <td><option>agent_mode</option> = <replaceable>agent</replaceable></td>
- <td>(StrOpt) The mode used to implement DHCP/metadata services.</td>
+ <td><option>cert_check</option> = <replaceable>False</replaceable></td>
+ <td>(BoolOpt) Enable SSL certificate check for vCenter.</td>
</tr>
<tr>
- <td><option>concurrent_connections</option> = <replaceable>10</replaceable></td>
- <td>(IntOpt) Maximum concurrent connections to each NSX controller.</td>
+ <td><option>cert_path</option> = <replaceable>/etc/ssl/certs/certs.pem</replaceable></td>
+ <td>(StrOpt) Certificate chain path containing cacert of vCenters.</td>
</tr>
<tr>
- <td><option>default_transport_type</option> = <replaceable>stt</replaceable></td>
- <td>(StrOpt) The default network tranport type to use (stt, gre, bridge, ipsec_gre, or ipsec_stt)</td>
+ <td><option>cluster_dvs_mapping</option> = <replaceable>[]</replaceable></td>
+ <td>(MultiStrOpt) vCenter cluster to DVS mapping.</td>
</tr>
<tr>
- <td><option>max_lp_per_bridged_ls</option> = <replaceable>5000</replaceable></td>
- <td>(IntOpt) Maximum number of ports of a logical switch on a bridged transport zone (default 5000)</td>
+ <td><option>esx_hostname</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) ESX host name where this OVSvApp is hosted.</td>
</tr>
<tr>
- <td><option>max_lp_per_overlay_ls</option> = <replaceable>256</replaceable></td>
- <td>(IntOpt) Maximum number of ports of a logical switch on an overlay transport zone (default 256)</td>
+ <td><option>esx_maintenance_mode</option> = <replaceable>True</replaceable></td>
+ <td>(BoolOpt) Set host into maintenance mode.</td>
</tr>
<tr>
- <td><option>metadata_mode</option> = <replaceable>access_network</replaceable></td>
- <td>(StrOpt) If set to access_network this enables a dedicated connection to the metadata proxy for metadata server access via Neutron router. If set to dhcp_host_route this enables host route injection via the dhcp agent. This option is only useful if running on a host that does not support namespaces otherwise access_network should be used.</td>
+ <td><option>https_port</option> = <replaceable>443</replaceable></td>
+ <td>(IntOpt) Customized https_port for vCenter communication.</td>
</tr>
<tr>
- <td><option>nsx_gen_timeout</option> = <replaceable>-1</replaceable></td>
- <td>(IntOpt) Number of seconds a generation id should be valid for (default -1 meaning do not time out)</td>
+ <td><option>vcenter_api_retry_count</option> = <replaceable>5</replaceable></td>
+ <td>(StrOpt) Number of retries while connecting to vcenter server.</td>
</tr>
<tr>
- <td><option>replication_mode</option> = <replaceable>service</replaceable></td>
- <td>(StrOpt) The default option leverages service nodes to perform packet replication though one could set to this to 'source' to perform replication locally. This is useful if one does not want to deploy a service node(s). It must be set to 'service' for leveraging distributed routers.</td>
+ <td><option>vcenter_ip</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) vCenter server IP.</td>
</tr>
<tr>
- <th colspan="2">[NSX_DHCP]</th>
+ <td><option>vcenter_password</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) vCenter server password.</td>
</tr>
<tr>
- <td><option>default_lease_time</option> = <replaceable>43200</replaceable></td>
- <td>(IntOpt) Default DHCP lease time</td>
+ <td><option>vcenter_username</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) vCenter server user name.</td>
</tr>
<tr>
- <td><option>domain_name</option> = <replaceable>openstacklocal</replaceable></td>
- <td>(StrOpt) Domain to use for building the hostnames</td>
- </tr>
- <tr>
- <td><option>extra_domain_name_servers</option> = <replaceable></replaceable></td>
- <td>(ListOpt) Comma separated list of additional domain name servers</td>
- </tr>
- <tr>
- <th colspan="2">[NSX_LSN]</th>
- </tr>
- <tr>
- <td><option>sync_on_missing_data</option> = <replaceable>False</replaceable></td>
- <td>(BoolOpt) Pull LSN information from NSX in case it is missing from the local data store. This is useful to rebuild the local store in case of server recovery.</td>
- </tr>
- <tr>
- <th colspan="2">[NSX_METADATA]</th>
- </tr>
- <tr>
- <td><option>metadata_server_address</option> = <replaceable>127.0.0.1</replaceable></td>
- <td>(StrOpt) IP address used by Metadata server.</td>
- </tr>
- <tr>
- <td><option>metadata_server_port</option> = <replaceable>8775</replaceable></td>
- <td>(IntOpt) TCP Port used by Metadata server.</td>
- </tr>
- <tr>
- <td><option>metadata_shared_secret</option> = <replaceable></replaceable></td>
- <td>(StrOpt) Shared secret to sign instance-id request</td>
- </tr>
- <tr>
- <th colspan="2">[NSX_SYNC]</th>
- </tr>
- <tr>
- <td><option>always_read_status</option> = <replaceable>False</replaceable></td>
- <td>(BoolOpt) Always read operational status from backend on show operations. Enabling this option might slow down the system.</td>
- </tr>
- <tr>
- <td><option>max_random_sync_delay</option> = <replaceable>0</replaceable></td>
- <td>(IntOpt) Maximum value for the additional random delay in seconds between runs of the state synchronization task</td>
- </tr>
- <tr>
- <td><option>min_chunk_size</option> = <replaceable>500</replaceable></td>
- <td>(IntOpt) Minimum number of resources to be retrieved from NSX during state synchronization</td>
- </tr>
- <tr>
- <td><option>min_sync_req_delay</option> = <replaceable>1</replaceable></td>
- <td>(IntOpt) Minimum delay, in seconds, between two state synchronization queries to NSX. It must not exceed state_sync_interval</td>
- </tr>
- <tr>
- <td><option>state_sync_interval</option> = <replaceable>10</replaceable></td>
- <td>(IntOpt) Interval in seconds between runs of the state synchronization task. Set it to 0 to disable it</td>
- </tr>
- <tr>
- <th colspan="2">[vcns]</th>
- </tr>
- <tr>
- <td><option>datacenter_moid</option> = <replaceable>None</replaceable></td>
- <td>(StrOpt) Optional parameter identifying the ID of datacenter to deploy NSX Edges</td>
- </tr>
- <tr>
- <td><option>datastore_id</option> = <replaceable>None</replaceable></td>
- <td>(StrOpt) Optional parameter identifying the ID of datastore to deploy NSX Edges</td>
- </tr>
- <tr>
- <td><option>deployment_container_id</option> = <replaceable>None</replaceable></td>
- <td>(StrOpt) Optional parameter identifying the ID of datastore to deploy NSX Edges</td>
- </tr>
- <tr>
- <td><option>external_network</option> = <replaceable>None</replaceable></td>
- <td>(StrOpt) Network ID for physical network connectivity</td>
- </tr>
- <tr>
- <td><option>manager_uri</option> = <replaceable>None</replaceable></td>
- <td>(StrOpt) uri for vsm</td>
- </tr>
- <tr>
- <td><option>password</option> = <replaceable>default</replaceable></td>
- <td>(StrOpt) Password for vsm</td>
- </tr>
- <tr>
- <td><option>resource_pool_id</option> = <replaceable>None</replaceable></td>
- <td>(StrOpt) Optional parameter identifying the ID of resource to deploy NSX Edges</td>
- </tr>
- <tr>
- <td><option>task_status_check_interval</option> = <replaceable>2000</replaceable></td>
- <td>(IntOpt) Task status check interval</td>
- </tr>
- <tr>
- <td><option>user</option> = <replaceable>admin</replaceable></td>
- <td>(StrOpt) User name for vsm</td>
+ <td><option>wsdl_location</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) vCenter server wsdl location.</td>
</tr>
</tbody>
</table>
diff --git a/doc/config-reference/networking/section_networking-options-reference.xml b/doc/config-reference/networking/section_networking-options-reference.xml
index a22acd36f0..590fa40f9e 100644
--- a/doc/config-reference/networking/section_networking-options-reference.xml
+++ b/doc/config-reference/networking/section_networking-options-reference.xml
@@ -117,6 +117,13 @@
<xi:include href="../../common/tables/neutron-metering_agent.xml"/>
</section>
+<section xml:id="networking-options-nova">
+<title>Nova</title>
+<para>Use the following options in the
+<filename>neutron.conf</filename> file to change nova-related settings.</para>
+ <xi:include href="../../common/tables/neutron-nova.xml"/>
+</section>
+
<section xml:id="networking-options-policy">
<title>Policy</title>
<para>Use the following options in the
diff --git a/doc/config-reference/networking/section_networking-plugins.xml b/doc/config-reference/networking/section_networking-plugins.xml
index 8eabdd6efa..f63647c427 100644
--- a/doc/config-reference/networking/section_networking-plugins.xml
+++ b/doc/config-reference/networking/section_networking-plugins.xml
@@ -98,6 +98,12 @@
href="../../common/tables/neutron-sdnve.xml"
/>
</section>
+ <section xml:id="networking-plugin-l2gw">
+ <title>Layer 2 Gateway configuration options</title>
+ <xi:include
+ href="../../common/tables/neutron-l2gw.xml"
+ />
+ </section>
<section xml:id="networking-plugin-linuxbridge_agent">
<title>Linux bridge Agent configuration
options</title>
@@ -164,9 +170,15 @@
/>
</section>
<section xml:id="networking-plugin-vmware">
- <title>VMware NSX configuration options</title>
+ <title>VMware vSphere configuration options</title>
<xi:include
href="../../common/tables/neutron-vmware.xml"
/>
</section>
+ <section xml:id="networking-plugin-nsx">
+ <title>VMware NSX configuration options</title>
+ <xi:include
+ href="../../common/tables/neutron-nsx.xml"
+ />
+ </section>
</section>
diff --git a/tools/autogenerate-config-flagmappings/neutron.flagmappings b/tools/autogenerate-config-flagmappings/neutron.flagmappings
index 84a7e1a79e..a7e533a2d8 100644
--- a/tools/autogenerate-config-flagmappings/neutron.flagmappings
+++ b/tools/autogenerate-config-flagmappings/neutron.flagmappings
@@ -1,6 +1,7 @@
admin_password common
admin_tenant_name common
admin_user common
+advertise_mtu dhcp_agent
agent_down_time common
agent_mode l3_agent
allow_automatic_dhcp_failover l3_agent
@@ -9,8 +10,6 @@ allow_bulk api
allow_overlapping_ips policy
allow_pagination api
allow_sorting api
-amqp_auto_delete amqp
-amqp_durable_queues amqp
api_extensions_path api
api_paste_config api
api_workers common
@@ -25,20 +24,20 @@ backlog api
base_mac common
bind_host common
bind_port common
-ca_certs common
client_socket_timeout api
-conn_idle_timeout api
+conn_idle_timeout nsx
control_exchange amqp
core_plugin common
-ctl_cert common
-ctl_privkey common
debug logging
+default_device_name l2gw
default_interface_name vmware
-default_l2_gw_service_uuid vmware
-default_l3_gw_service_uuid vmware
+default_ipv4_subnet_pool common
+default_ipv6_subnet_pool common
+default_l2_gw_service_uuid l2gw
+default_l3_gw_service_uuid l2gw
default_log_levels logging
-default_service_cluster_uuid vmware
-default_tz_uuid vmware
+default_service_cluster_uuid nsx
+default_tz_uuid nsx
dhcp_agent_notification common
dhcp_agents_per_network common
dhcp_broadcast_reply common
@@ -47,18 +46,21 @@ dhcp_delete_namespaces common
dhcp_domain common
dhcp_driver common
dhcp_lease_duration common
+dhcp_load_type common
dnsmasq_config_file dhcp_agent
dnsmasq_dns_servers dhcp_agent
dnsmasq_lease_max dhcp_agent
driver metering_agent
dvr_base_mac dvr
+ebtables_path common
enable_isolated_metadata dhcp_agent
enable_metadata_network dhcp_agent
enable_metadata_proxy l3_agent
+enable_services_on_agents_with_admin_state_down common
endpoint_type common
+external_ingress_mark l3_agent
external_network_bridge l3_agent
external_pids agent
-fake_rabbit testing
fatal_deprecations logging
force_gateway_on_subnet common
gateway_external_network_id l3_agent
@@ -68,18 +70,20 @@ ha_vrrp_auth_password l3_agent
ha_vrrp_auth_type l3_agent
handle_internal_only_routers l3_agent
host common
-http_timeout vmware
+http_timeout nsx
instance_format logging
instance_uuid_format logging
interface_driver common
ip_lib_force_root common
-kombu_reconnect_delay rabbitmq
-kombu_ssl_ca_certs rabbitmq
-kombu_ssl_certfile rabbitmq
-kombu_ssl_keyfile rabbitmq
-kombu_ssl_version rabbitmq
+ipv6_gateway l3_agent
+l2gw_callback_class l2gw
l3_ha l3_agent
l3_ha_net_cidr l3_agent
+log-config-append logging
+log-date-format logging
+log-dir logging
+log-file logging
+log-format logging
log_config_append logging
log_date_format logging
log_dir logging
@@ -108,7 +112,9 @@ metadata_port metadata
metadata_proxy_group metadata
metadata_proxy_shared_secret metadata
metadata_proxy_socket metadata
+metadata_proxy_socket_mode metadata
metadata_proxy_user metadata
+metadata_proxy_watch_log metadata
metadata_workers metadata
min_l3_agents_per_router l3_agent
network_auto_schedule scheduler
@@ -123,61 +129,34 @@ nova_admin_password compute
nova_admin_tenant_id compute
nova_admin_tenant_name compute
nova_admin_username compute
-nova_api_insecure compute
-nova_ca_certificates_file compute
nova_client_cert compute
nova_client_priv_key compute
nova_metadata_insecure metadata
nova_metadata_ip metadata
nova_metadata_port metadata
nova_metadata_protocol metadata
-nova_region_name compute
nova_url compute
-nsx_controllers vmware
-nsx_password vmware
-nsx_user vmware
+nsx_controllers nsx
+nsx_password nsx
+nsx_user nsx
num_sync_threads dhcp_agent
-ofp_listen_host ml2_ofa
-ofp_ssl_listen_port ml2_ofa
-ofp_tcp_listen_port ml2_ofa
ovs_integration_bridge openvswitch_agent
ovs_use_veth openvswitch_agent
ovs_vsctl_timeout openvswitch_agent
pagination_max_limit api
periodic_fuzzy_delay common
periodic_interval common
+periodic_monitoring_interval common
policy_default_rule policy
policy_dirs policy
policy_file policy
publish_errors logging
-qpid_heartbeat qpid
-qpid_hostname qpid
-qpid_hosts qpid
-qpid_password qpid
-qpid_port qpid
-qpid_protocol qpid
-qpid_receiver_capacity qpid
-qpid_sasl_mechanisms qpid
-qpid_tcp_nodelay qpid
-qpid_topology_version qpid
-qpid_username qpid
+quota_l2_gateway l2gw
ra_confs ipv6_ra
-rabbit_ha_queues rabbitmq
-rabbit_host rabbitmq
-rabbit_hosts rabbitmq
-rabbit_login_method rabbitmq
-rabbit_max_retries rabbitmq
-rabbit_password rabbitmq
-rabbit_port rabbitmq
-rabbit_retry_backoff rabbitmq
-rabbit_retry_interval rabbitmq
-rabbit_use_ssl rabbitmq
-rabbit_userid rabbitmq
-rabbit_virtual_host rabbitmq
-redirects vmware
+redirects nsx
report_interval common
resync_interval dhcp_agent
-retries vmware
+retries nsx
retry_until_window api
router_auto_schedule scheduler
router_delete_namespaces scheduler
@@ -186,7 +165,6 @@ router_id l3_agent
router_scheduler_driver scheduler
rpc_backend rpc
rpc_cast_timeout rpc
-rpc_conn_pool_size rpc
rpc_response_timeout rpc
rpc_thread_pool_size rpc
rpc_workers rpc
@@ -205,17 +183,19 @@ ssl_ca_file ca
ssl_cert_file ca
ssl_key_file ca
state_path common
+syslog-log-facility logging
syslog_log_facility logging
tcp_keepidle api
transport_url amqp
+use-syslog logging
+use-syslog-rfc-format logging
use_namespaces dhcp_agent
use_ssl logging
use_stderr logging
use_syslog logging
use_syslog_rfc_format logging
verbose logging
-wsapi_host ryu
-wsapi_port ryu
+vlan_transparent common
wsgi_keep_alive api
AGENT/arp_responder openvswitch_agent
AGENT/check_child_processes_action common
@@ -224,19 +204,19 @@ AGENT/comment_iptables_rules l3_agent
AGENT/dont_fragment openvswitch_agent ml2_ofa
AGENT/enable_distributed_routing openvswitch_agent
AGENT/enable_metrics_collection hyperv_agent
-AGENT/get_datapath_retry_times ml2_ofa
AGENT/integration_bridge nvsd
AGENT/l2_population openvswitch_agent
AGENT/local_network_vswitch hyperv_agent
AGENT/metrics_max_retries hyperv_agent
AGENT/minimize_polling openvswitch_agent
AGENT/ovsdb_monitor_respawn_interval openvswitch_agent
-AGENT/physical_interface_mappings ml2_ofa
AGENT/physical_network_vswitch_mappings hyperv_agent
AGENT/polling_interval hyperv_agent
+AGENT/prevent_arp_spoofing openvswitch_agent
AGENT/quitting_rpc_timeout openvswitch_agent
AGENT/report_interval metering_agent
AGENT/root_helper common
+AGENT/root_helper_daemon common
AGENT/rpc_support_old_agents rpc
AGENT/tunnel_types openvswitch_agent
AGENT/use_helper_for_ns_read l3_agent
@@ -267,9 +247,12 @@ CISCO_N1K/tunnel_bridge cisco
CISCO_N1K/vxlan_id_ranges cisco
CONTRAIL/api_server_ip opencontrail
CONTRAIL/api_server_port opencontrail
+ESWITCH/backoff_rate ml2_mlnx
+ESWITCH/daemon_endpoint ml2_mlnx
+ESWITCH/physical_interface_mappings ml2_mlnx
+ESWITCH/request_timeout ml2_mlnx
+ESWITCH/retries ml2_mlnx
ESWITCH/vnic_type ml2_mlnx
-HYPERV/network_vlan_ranges hyperv_agent
-HYPERV/tenant_network_type hyperv_agent
L3_BROCADE_MLX_EXAMPLE/address l3_brocade_mlx_switch
L3_BROCADE_MLX_EXAMPLE/password l3_brocade_mlx_switch
L3_BROCADE_MLX_EXAMPLE/physical_networks l3_brocade_mlx_switch
@@ -283,6 +266,10 @@ META/l3_plugin_list meta
META/plugin_list meta
META/rpc_flavor meta
META/supported_extension_aliases meta
+MIDONET/cluster_ip midonet
+MIDONET/cluster_port midonet
+MIDONET/tunnel_protocol midonet
+MIDONET/use_cluster midonet
ML2_BROCADE_MLX_EXAMPLE/address ml2_brocade_fi_ni_switch
ML2_BROCADE_MLX_EXAMPLE/ostype ml2_brocade_fi_ni_switch
ML2_BROCADE_MLX_EXAMPLE/password ml2_brocade_fi_ni_switch
@@ -308,26 +295,19 @@ NOVA/node_override_vif_unbound bigswitch ml2_bigswitch
NOVA/node_override_vif_vrouter bigswitch ml2_bigswitch
NOVA/vif_type bigswitch ml2_bigswitch
NOVA/vif_types bigswitch ml2_bigswitch
-NSX/agent_mode vmware
-NSX/concurrent_connections vmware
-NSX/default_transport_type vmware
-NSX/max_lp_per_bridged_ls vmware
-NSX/max_lp_per_overlay_ls vmware
-NSX/metadata_mode vmware
-NSX/nsx_gen_timeout vmware
-NSX/replication_mode vmware
-NSX_DHCP/default_lease_time vmware
-NSX_DHCP/domain_name vmware
-NSX_DHCP/extra_domain_name_servers vmware
-NSX_LSN/sync_on_missing_data vmware
-NSX_METADATA/metadata_server_address vmware
-NSX_METADATA/metadata_server_port vmware
-NSX_METADATA/metadata_shared_secret vmware
-NSX_SYNC/always_read_status vmware
-NSX_SYNC/max_random_sync_delay vmware
-NSX_SYNC/min_chunk_size vmware
-NSX_SYNC/min_sync_req_delay vmware
-NSX_SYNC/state_sync_interval vmware
+NSX/agent_mode nsx
+NSX/concurrent_connections nsx
+NSX/default_transport_type nsx
+NSX/max_lp_per_bridged_ls nsx
+NSX/max_lp_per_overlay_ls nsx
+NSX/metadata_mode nsx
+NSX/nsx_gen_timeout nsx
+NSX/replication_mode nsx
+NSX_SYNC/always_read_status nsx
+NSX_SYNC/max_random_sync_delay nsx
+NSX_SYNC/min_chunk_size nsx
+NSX_SYNC/min_sync_req_delay nsx
+NSX_SYNC/state_sync_interval nsx
OFC/api_max_attempts nec
OFC/cert_file nec
OFC/driver nec
@@ -347,6 +327,15 @@ OVS/ovsdb_interface openvswitch_agent
OVS/tun_peer_patch_port openvswitch_agent
OVS/tunnel_bridge openvswitch_agent
OVS/use_veth_interconnection openvswitch_agent
+OVSVAPP/agent_driver vmware
+OVSVAPP/agent_maintenance vmware
+OVSVAPP/bridge_mappings vmware
+OVSVAPP/integration_bridge vmware
+OVSVAPP/network_manager vmware
+OVSVAPP/polling_interval vmware
+OVSVAPP/report_interval vmware
+OVSVAPP/tenant_network_type vmware
+OVSVAPP/veth_mtu vmware
PHYSICAL_INTERFACE/physical_interface brocade
PROVIDER/default_router_provider nec
PROVIDER/router_providers nec
@@ -359,33 +348,29 @@ PROXY/auth_url common
QUOTAS/default_quota quotas
QUOTAS/quota_driver quotas
QUOTAS/quota_floatingip quotas
+QUOTAS/quota_health_monitor quotas
QUOTAS/quota_items quotas
+QUOTAS/quota_member quotas
QUOTAS/quota_network quotas
QUOTAS/quota_network_gateway quotas
QUOTAS/quota_packet_filter quotas
+QUOTAS/quota_pool quotas
QUOTAS/quota_port quotas
QUOTAS/quota_router quotas
QUOTAS/quota_security_group quotas
QUOTAS/quota_security_group_rule quotas
QUOTAS/quota_subnet quotas
+QUOTAS/quota_vip quotas
RESTPROXY/add_meta_server_route bigswitch ml2_bigswitch
-RESTPROXY/auth_resource nuage
RESTPROXY/auto_sync_on_failure bigswitch ml2_bigswitch
-RESTPROXY/base_uri nuage
RESTPROXY/cache_connections bigswitch ml2_bigswitch
RESTPROXY/consistency_interval bigswitch ml2_bigswitch
-RESTPROXY/default_floatingip_quota nuage
-RESTPROXY/default_net_partition_name nuage
RESTPROXY/neutron_id bigswitch ml2_bigswitch
RESTPROXY/no_ssl_validation bigswitch ml2_bigswitch
-RESTPROXY/organization nuage
-RESTPROXY/server nuage
RESTPROXY/server_auth bigswitch ml2_bigswitch
RESTPROXY/server_ssl bigswitch ml2_bigswitch
RESTPROXY/server_timeout bigswitch ml2_bigswitch
-RESTPROXY/serverauth nuage
RESTPROXY/servers bigswitch ml2_bigswitch
-RESTPROXY/serverssl nuage
RESTPROXY/ssl_cert_directory bigswitch ml2_bigswitch
RESTPROXY/ssl_sticky bigswitch ml2_bigswitch
RESTPROXY/sync_data bigswitch ml2_bigswitch
@@ -412,19 +397,31 @@ SDNVE/use_fake_controller sdnve
SDNVE/userid sdnve
SDNVE_AGENT/polling_interval sdnve
SDNVE_AGENT/rpc sdnve
+SECURITYGROUP/defer_apply securitygroups
SECURITYGROUP/enable_ipset securitygroups
SECURITYGROUP/enable_security_group securitygroups
SECURITYGROUP/firewall_driver securitygroups
+SECURITYGROUP/ovsvapp_firewall_driver securitygroups
+SECURITYGROUP/security_bridge_mapping securitygroups
SRIOV_NIC/exclude_devices sriov
SRIOV_NIC/physical_device_mappings sriov
SWITCH/address brocade
SWITCH/ostype brocade
SWITCH/password brocade
SWITCH/username brocade
-SYNCMANAGER/enable_sync nuage
-SYNCMANAGER/sync_interval nuage
VLANS/network_vlan_ranges linuxbridge_agent
VLANS/tenant_network_type linuxbridge_agent
+VMWARE/cert_check vmware
+VMWARE/cert_path vmware
+VMWARE/cluster_dvs_mapping vmware
+VMWARE/esx_hostname vmware
+VMWARE/esx_maintenance_mode vmware
+VMWARE/https_port vmware
+VMWARE/vcenter_api_retry_count vmware
+VMWARE/vcenter_ip vmware
+VMWARE/vcenter_password vmware
+VMWARE/vcenter_username vmware
+VMWARE/wsdl_location vmware
VROUTER/flavor brocade_vyatta_l3
VROUTER/image_id brocade_vyatta_l3
VROUTER/keystone_url brocade_vyatta_l3
@@ -443,10 +440,8 @@ VXLAN/local_ip linuxbridge_agent
VXLAN/tos linuxbridge_agent
VXLAN/ttl linuxbridge_agent
VXLAN/vxlan_group linuxbridge_agent
-cfg_agent/device_connection_timeout cfg_agent
-cfg_agent/hosting_device_dead_timeout cfg_agent
-cfg_agent/routing_svc_helper_class cfg_agent
-cfg_agent/rpc_loop_interval cfg_agent
+cfg_agent/device_connection_timeout cisco
+cfg_agent/hosting_device_dead_timeout cisco
database/backend database
database/connection database
database/connection_debug database
@@ -489,7 +484,6 @@ heleos/resource_pool_id embrane
heleos/router_image embrane
hosting_devices/csr1kv_booting_time cisco
hosting_devices/csr1kv_cfgagent_router_driver cisco
-hosting_devices/csr1kv_configdrive_template cisco
hosting_devices/csr1kv_device_driver cisco
hosting_devices/csr1kv_flavor cisco
hosting_devices/csr1kv_image cisco
@@ -548,7 +542,11 @@ matchmaker_redis/password redis
matchmaker_redis/port redis
matchmaker_ring/ringfile redis
ml2/extension_drivers ml2
+ml2/external_network_type ml2
ml2/mechanism_drivers ml2
+ml2/path_mtu ml2
+ml2/physical_network_mtus ml2
+ml2/segment_mtu ml2
ml2/tenant_network_types ml2
ml2/type_drivers ml2
ml2_arista/eapi_host ml2_arista
@@ -565,6 +563,17 @@ ml2_brocade/physical_networks ml2_brocade
ml2_brocade/rbridge_id ml2_brocade
ml2_brocade/username ml2_brocade
ml2_brocade_fi_ni/switch_names ml2_brocade_fi_ni
+ml2_cisco/host_key_checks ml2_cisco
+ml2_cisco/managed_physical_network ml2_cisco
+ml2_cisco/persistent_switch_config ml2_cisco
+ml2_cisco/provider_vlan_auto_create ml2_cisco
+ml2_cisco/provider_vlan_auto_trunk ml2_cisco
+ml2_cisco/provider_vlan_name_prefix ml2_cisco
+ml2_cisco/svi_round_robin ml2_cisco
+ml2_cisco/switch_heartbeat_time ml2_cisco
+ml2_cisco/switch_replay_count ml2_cisco
+ml2_cisco/vlan_name_prefix ml2_cisco
+ml2_cisco/vxlan_global_config ml2_cisco
ml2_cisco_apic/apic_agent_poll_interval ml2_cisco
ml2_cisco_apic/apic_agent_report_interval ml2_cisco
ml2_cisco_apic/apic_app_profile_name ml2_cisco
@@ -583,6 +592,22 @@ ml2_cisco_apic/apic_username ml2_cisco
ml2_cisco_apic/apic_vlan_ns_name ml2_cisco
ml2_cisco_apic/apic_vlan_range ml2_cisco
ml2_cisco_apic/apic_vpc_pairs ml2_cisco
+ml2_cisco_n1kv/default_policy_profile ml2_cisco
+ml2_cisco_n1kv/default_vlan_network_profile ml2_cisco
+ml2_cisco_n1kv/default_vxlan_network_profile ml2_cisco
+ml2_cisco_n1kv/http_pool_size ml2_cisco
+ml2_cisco_n1kv/http_timeout ml2_cisco
+ml2_cisco_n1kv/n1kv_vsm_ips ml2_cisco
+ml2_cisco_n1kv/password ml2_cisco
+ml2_cisco_n1kv/poll_duration ml2_cisco
+ml2_cisco_n1kv/restrict_policy_profiles ml2_cisco
+ml2_cisco_n1kv/sync_interval ml2_cisco
+ml2_cisco_n1kv/username ml2_cisco
+ml2_cisco_ucsm/supported_pci_devs ml2_cisco
+ml2_cisco_ucsm/ucsm_host_list ml2_cisco
+ml2_cisco_ucsm/ucsm_ip ml2_cisco
+ml2_cisco_ucsm/ucsm_password ml2_cisco
+ml2_cisco_ucsm/ucsm_username ml2_cisco
ml2_fslsdn/crd_api_insecure ml2_fslsdn
ml2_fslsdn/crd_auth_strategy ml2_fslsdn
ml2_fslsdn/crd_auth_url ml2_fslsdn
@@ -597,18 +622,53 @@ ml2_ncs/password ml2_ncs
ml2_ncs/timeout ml2_ncs
ml2_ncs/url ml2_ncs
ml2_ncs/username ml2_ncs
+ml2_odl/password ml2_odl
+ml2_odl/session_timeout ml2_odl
+ml2_odl/timeout ml2_odl
+ml2_odl/url ml2_odl
+ml2_odl/username ml2_odl
ml2_sriov/agent_required ml2_sriov
ml2_sriov/supported_pci_vendor_devs ml2_sriov
ml2_type_flat/flat_networks ml2_flat
ml2_type_gre/tunnel_id_ranges ml2_gre
+ml2_type_nexus_vxlan/mcast_ranges ml2_vxlan
+ml2_type_nexus_vxlan/vni_ranges ml2_vxlan
ml2_type_vlan/network_vlan_ranges ml2_vlan
ml2_type_vxlan/vni_ranges ml2_vxlan
ml2_type_vxlan/vxlan_group ml2_vxlan
-n1kv/management_port_profile cisco
-n1kv/t1_network_profile cisco
-n1kv/t1_port_profile cisco
-n1kv/t2_network_profile cisco
-n1kv/t2_port_profile cisco
+nova/auth_plugin nova
+nova/auth_section nova
+nova/cafile nova
+nova/certfile nova
+nova/insecure nova
+nova/keyfile nova
+nova/region_name nova
+nova/timeout nova
+nsx_v3/default_edge_cluster_uuid nsx
+nsxv/backup_edge_pool nsx
+nsxv/cluster_moid nsx
+nsxv/datacenter_moid nsx
+nsxv/datastore_id nsx
+nsxv/deployment_container_id nsx
+nsxv/dvs_id nsx
+nsxv/external_network nsx
+nsxv/manager_uri nsx
+nsxv/maximum_tunnels_per_vnic nsx
+nsxv/metadata_shared_secret nsx
+nsxv/mgt_net_default_gateway nsx
+nsxv/mgt_net_moid nsx
+nsxv/mgt_net_proxy_ips nsx
+nsxv/mgt_net_proxy_netmask nsx
+nsxv/nova_metadata_ips nsx
+nsxv/nova_metadata_port nsx
+nsxv/password nsx
+nsxv/resource_pool_id nsx
+nsxv/retries nsx
+nsxv/spoofguard_enabled nsx
+nsxv/task_status_check_interval nsx
+nsxv/tenant_router_types nsx
+nsxv/user nsx
+nsxv/vdn_scope_id nsx
nvsd/nvsd_ip nvsd
nvsd/nvsd_passwd nvsd
nvsd/nvsd_port nvsd
@@ -628,6 +688,49 @@ oslo_messaging_amqp/ssl_cert_file rpc
oslo_messaging_amqp/ssl_key_file rpc
oslo_messaging_amqp/ssl_key_password rpc
oslo_messaging_amqp/trace rpc
+oslo_messaging_qpid/amqp_auto_delete rpc
+oslo_messaging_qpid/amqp_durable_queues rpc
+oslo_messaging_qpid/qpid_heartbeat rpc
+oslo_messaging_qpid/qpid_hostname rpc
+oslo_messaging_qpid/qpid_hosts rpc
+oslo_messaging_qpid/qpid_password rpc
+oslo_messaging_qpid/qpid_port rpc
+oslo_messaging_qpid/qpid_protocol rpc
+oslo_messaging_qpid/qpid_receiver_capacity rpc
+oslo_messaging_qpid/qpid_sasl_mechanisms rpc
+oslo_messaging_qpid/qpid_tcp_nodelay rpc
+oslo_messaging_qpid/qpid_topology_version rpc
+oslo_messaging_qpid/qpid_username rpc
+oslo_messaging_qpid/rpc_conn_pool_size rpc
+oslo_messaging_rabbit/amqp_auto_delete rpc
+oslo_messaging_rabbit/amqp_durable_queues rpc
+oslo_messaging_rabbit/fake_rabbit rpc
+oslo_messaging_rabbit/heartbeat_rate rpc
+oslo_messaging_rabbit/heartbeat_timeout_threshold rpc
+oslo_messaging_rabbit/kombu_reconnect_delay rpc
+oslo_messaging_rabbit/kombu_ssl_ca_certs rpc
+oslo_messaging_rabbit/kombu_ssl_certfile rpc
+oslo_messaging_rabbit/kombu_ssl_keyfile rpc
+oslo_messaging_rabbit/kombu_ssl_version rpc
+oslo_messaging_rabbit/rabbit_ha_queues rpc
+oslo_messaging_rabbit/rabbit_host rpc
+oslo_messaging_rabbit/rabbit_hosts rpc
+oslo_messaging_rabbit/rabbit_login_method rpc
+oslo_messaging_rabbit/rabbit_max_retries rpc
+oslo_messaging_rabbit/rabbit_password rpc
+oslo_messaging_rabbit/rabbit_port rpc
+oslo_messaging_rabbit/rabbit_retry_backoff rpc
+oslo_messaging_rabbit/rabbit_retry_interval rpc
+oslo_messaging_rabbit/rabbit_use_ssl rpc
+oslo_messaging_rabbit/rabbit_userid rpc
+oslo_messaging_rabbit/rabbit_virtual_host rpc
+oslo_messaging_rabbit/rpc_conn_pool_size rpc
+ovsdb/l2_gw_agent_ca_cert_base_path l2gw
+ovsdb/l2_gw_agent_cert_base_path l2gw
+ovsdb/l2_gw_agent_priv_key_base_path l2gw
+ovsdb/max_connection_retries l2gw
+ovsdb/ovsdb_hosts l2gw
+ovsdb/periodic_interval l2gw
plumgriddirector/director_server plumgrid
plumgriddirector/director_server_port plumgrid
plumgriddirector/driver plumgrid
@@ -635,12 +738,3 @@ plumgriddirector/password plumgrid
plumgriddirector/servertimeout plumgrid
plumgriddirector/username plumgrid
service_providers/service_provider api
-vcns/datacenter_moid vmware
-vcns/datastore_id vmware
-vcns/deployment_container_id vmware
-vcns/external_network vmware
-vcns/manager_uri vmware
-vcns/password vmware
-vcns/resource_pool_id vmware
-vcns/task_status_check_interval vmware
-vcns/user vmware
diff --git a/tools/autogenerate-config-flagmappings/neutron.headers b/tools/autogenerate-config-flagmappings/neutron.headers
index 7b56a94477..65fe81250d 100644
--- a/tools/autogenerate-config-flagmappings/neutron.headers
+++ b/tools/autogenerate-config-flagmappings/neutron.headers
@@ -9,6 +9,7 @@ embrane Embrane
fwaas FwaaS
hyperv_agent HyperV agent
ipv6_ra IPv6 router advertisement
+l2gw Layer 2 Gateway
l3_agent L3 agent
l3_arista Arista layer-3 service plug-in
l3_brocade_mlx Brocade MLX L3 plug-in
@@ -37,6 +38,8 @@ ml2_vlan ML2 VLAN
ml2_vxlan ML2 VXLN
mlnx Mellanox
nec Nec
+nova nova
+nsx VMware NSX
nuage Nuage
nvsd NVSD driver
opencontrail OpenContrail