diff --git a/doc/common/tables/neutron-agent.xml b/doc/common/tables/neutron-agent.xml
index 7c3be590aa..6b0c0fa380 100644
--- a/doc/common/tables/neutron-agent.xml
+++ b/doc/common/tables/neutron-agent.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_agent">
           <caption>Description of configuration options for agent</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-api.xml b/doc/common/tables/neutron-api.xml
index 27b1a69987..40a48c300a 100644
--- a/doc/common/tables/neutron-api.xml
+++ b/doc/common/tables/neutron-api.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_api">
           <caption>Description of configuration options for api</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-bigswitch.xml b/doc/common/tables/neutron-bigswitch.xml
index a6cd3f8ab4..022691ad3b 100644
--- a/doc/common/tables/neutron-bigswitch.xml
+++ b/doc/common/tables/neutron-bigswitch.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_bigswitch">
           <caption>Description of configuration options for bigswitch</caption>
            <col width="50%"/>
            <col width="50%"/>
@@ -81,18 +81,10 @@
                        <td>add_meta_server_route = True</td>
                        <td>(BoolOpt) Flag to decide if a route to the metadata server should be injected into the VM</td>
               </tr>
-              <tr>
-                       <td>auth_resource = </td>
-                       <td>(StrOpt) Nuage provided uri for initial authorization to access VSD</td>
-              </tr>
               <tr>
                        <td>auto_sync_on_failure = True</td>
                        <td>(BoolOpt) If neutron fails to create a resource because the backend controller doesn't know of a dependency, automatically trigger a full data synchronization to the controller.</td>
               </tr>
-              <tr>
-                       <td>base_uri = /</td>
-                       <td>(StrOpt) Nuage provided base uri to reach out to VSD</td>
-              </tr>
               <tr>
                        <td>cache_connections = True</td>
                        <td>(BoolOpt) Re-use HTTP/HTTPS connections to the controller.</td>
@@ -101,14 +93,6 @@
                        <td>consistency_interval = 60</td>
                        <td>(IntOpt) Time between verifications that the backend controller database is consistent with Neutron</td>
               </tr>
-              <tr>
-                       <td>default_floatingip_quota = 254</td>
-                       <td>(IntOpt) Per Net Partition quota of floating ips</td>
-              </tr>
-              <tr>
-                       <td>default_net_partition_name = OpenStackDefaultNetPartition</td>
-                       <td>(StrOpt) Default Network partition in which VSD will orchestrate network resources using openstack</td>
-              </tr>
               <tr>
                        <td>neutron_id = neutron-ol</td>
                        <td>(StrOpt) User defined identifier for this Neutron deployment</td>
@@ -117,14 +101,6 @@
                        <td>no_ssl_validation = False</td>
                        <td>(BoolOpt) Disables SSL certificate validation for controllers</td>
               </tr>
-              <tr>
-                       <td>organization = system</td>
-                       <td>(StrOpt) Organization name in which VSD will orchestrate network resources using openstack</td>
-              </tr>
-              <tr>
-                       <td>server = localhost:8800</td>
-                       <td>(StrOpt) IP Address and Port of Nuage's VSD server</td>
-              </tr>
               <tr>
                        <td>server_auth = None</td>
                        <td>(StrOpt) The username and password for authenticating against  the BigSwitch or Floodlight controller.</td>
@@ -137,18 +113,10 @@
                        <td>server_timeout = 10</td>
                        <td>(IntOpt) Maximum number of seconds to wait for proxy request to connect and complete.</td>
               </tr>
-              <tr>
-                       <td>serverauth = username:password</td>
-                       <td>(StrOpt) Username and password for authentication</td>
-              </tr>
               <tr>
                        <td>servers = localhost:8800</td>
                        <td>(ListOpt) A comma separated list of BigSwitch or Floodlight servers and port numbers. The plugin proxies the requests to the BigSwitch/Floodlight server, which performs the networking configuration. Only oneserver is needed per deployment, but you may wish todeploy multiple servers to support failover.</td>
               </tr>
-              <tr>
-                       <td>serverssl = False</td>
-                       <td>(BoolOpt) Boolean for SSL connection with VSD server</td>
-              </tr>
               <tr>
                        <td>ssl_cert_directory = /etc/neutron/plugins/bigswitch/ssl</td>
                        <td>(StrOpt) Directory containing ca_certs and host_certs certificate directories.</td>
diff --git a/doc/common/tables/neutron-brocade.xml b/doc/common/tables/neutron-brocade.xml
index d27bc4dea4..190135f0f5 100644
--- a/doc/common/tables/neutron-brocade.xml
+++ b/doc/common/tables/neutron-brocade.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_brocade">
           <caption>Description of configuration options for brocade</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-cisco.xml b/doc/common/tables/neutron-cisco.xml
index bc6ebe6ee0..928b393fe3 100644
--- a/doc/common/tables/neutron-cisco.xml
+++ b/doc/common/tables/neutron-cisco.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_cisco">
           <caption>Description of configuration options for cisco</caption>
            <col width="50%"/>
            <col width="50%"/>
@@ -53,6 +53,10 @@
               <tr>
                   <th colspan="2">[CISCO_N1K]</th>
               </tr>
+              <tr>
+                       <td>bridge_mappings = </td>
+                       <td>(StrOpt) N1K Bridge Mappings</td>
+              </tr>
               <tr>
                        <td>default_network_profile = default_network_profile</td>
                        <td>(StrOpt) N1K default network profile</td>
@@ -61,6 +65,14 @@
                        <td>default_policy_profile = service_profile</td>
                        <td>(StrOpt) N1K default policy profile</td>
               </tr>
+              <tr>
+                       <td>enable_tunneling = True</td>
+                       <td>(BoolOpt) N1K Enable Tunneling</td>
+              </tr>
+              <tr>
+                       <td>integration_bridge = br-int</td>
+                       <td>(StrOpt) N1K Integration Bridge</td>
+              </tr>
               <tr>
                        <td>network_node_policy_profile = dhcp_pp</td>
                        <td>(StrOpt) N1K policy profile for network node</td>
@@ -77,6 +89,10 @@
                        <td>tenant_network_type = local</td>
                        <td>(StrOpt) N1K Tenant Network Type</td>
               </tr>
+              <tr>
+                       <td>tunnel_bridge = br-tun</td>
+                       <td>(StrOpt) N1K Tunnel Bridge</td>
+              </tr>
               <tr>
                        <td>vxlan_id_ranges = 5000:10000</td>
                        <td>(StrOpt) N1K VXLAN ID Ranges</td>
@@ -92,6 +108,13 @@
                        <td>vswitch_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2</td>
                        <td>(StrOpt) Virtual Switch to use</td>
               </tr>
+              <tr>
+                  <th colspan="2">[cisco_csr_ipsec]</th>
+              </tr>
+              <tr>
+                       <td>status_check_interval = 60</td>
+                       <td>(IntOpt) Status check interval for Cisco CSR IPSec connections</td>
+              </tr>
               <tr>
                   <th colspan="2">[ml2_cisco]</th>
               </tr>
diff --git a/doc/common/tables/neutron-common.xml b/doc/common/tables/neutron-common.xml
index a8a8c08d17..6306e8a422 100644
--- a/doc/common/tables/neutron-common.xml
+++ b/doc/common/tables/neutron-common.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_common">
           <caption>Description of configuration options for common</caption>
            <col width="50%"/>
            <col width="50%"/>
@@ -31,7 +31,7 @@
                        <td>(StrOpt) Admin username</td>
               </tr>
               <tr>
-                       <td>agent_down_time = 9</td>
+                       <td>agent_down_time = 75</td>
                        <td>(IntOpt) Seconds to regard the agent is down; should be at least twice report_interval, to be sure the agent is down for good.</td>
               </tr>
               <tr>
diff --git a/doc/common/tables/neutron-compute.xml b/doc/common/tables/neutron-compute.xml
new file mode 100644
index 0000000000..86bae07640
--- /dev/null
+++ b/doc/common/tables/neutron-compute.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+        <!-- Warning: Do not edit this file. It is automatically
+             generated and your changes will be overwritten.
+             The tool to do so lives in the tools directory of this
+             repository -->
+        <para xmlns="http://docbook.org/ns/docbook" version="5.0">
+        <table rules="all" xml:id="config_table_neutron_compute">
+          <caption>Description of configuration options for compute</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>notify_nova_on_port_data_changes = True</td>
+                       <td>(BoolOpt) Send notification to nova when port data (fixed_ips/floatingip) changes so nova can update its cache.</td>
+              </tr>
+              <tr>
+                       <td>notify_nova_on_port_status_changes = True</td>
+                       <td>(BoolOpt) Send notification to nova when port status changes</td>
+              </tr>
+              <tr>
+                       <td>nova_admin_auth_url = http://localhost:5000/v2.0</td>
+                       <td>(StrOpt) Authorization URL for connecting to nova in admin context</td>
+              </tr>
+              <tr>
+                       <td>nova_admin_password = None</td>
+                       <td>(StrOpt) Password for connection to nova in admin context</td>
+              </tr>
+              <tr>
+                       <td>nova_admin_tenant_id = None</td>
+                       <td>(StrOpt) The uuid of the admin nova tenant</td>
+              </tr>
+              <tr>
+                       <td>nova_admin_username = None</td>
+                       <td>(StrOpt) Username for connecting to nova in admin context</td>
+              </tr>
+              <tr>
+                       <td>nova_region_name = None</td>
+                       <td>(StrOpt) Name of nova region to use. Useful if keystone manages more than one region.</td>
+              </tr>
+              <tr>
+                       <td>nova_url = http://127.0.0.1:8774</td>
+                       <td>(StrOpt) URL for connection to nova</td>
+              </tr>
+              <tr>
+                       <td>send_events_interval = 2</td>
+                       <td>(IntOpt) Number of seconds between sending events to nova if there are any events to send.</td>
+              </tr>
+       </tbody>
+        </table>
+        </para>
diff --git a/doc/common/tables/neutron-db.xml b/doc/common/tables/neutron-db.xml
index 00bafbce4f..b99ed6637e 100644
--- a/doc/common/tables/neutron-db.xml
+++ b/doc/common/tables/neutron-db.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_db">
           <caption>Description of configuration options for db</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-debug.xml b/doc/common/tables/neutron-debug.xml
index a368759c2b..1ff8d424ab 100644
--- a/doc/common/tables/neutron-debug.xml
+++ b/doc/common/tables/neutron-debug.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_debug">
           <caption>Description of configuration options for debug</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-dhcp_agent.xml b/doc/common/tables/neutron-dhcp_agent.xml
index 2e3ab90965..272398a0dc 100644
--- a/doc/common/tables/neutron-dhcp_agent.xml
+++ b/doc/common/tables/neutron-dhcp_agent.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_dhcp_agent">
           <caption>Description of configuration options for dhcp_agent</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-embrane.xml b/doc/common/tables/neutron-embrane.xml
index 764f15f4a1..465908e41d 100644
--- a/doc/common/tables/neutron-embrane.xml
+++ b/doc/common/tables/neutron-embrane.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_embrane">
           <caption>Description of configuration options for embrane</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-embrane_lb.xml b/doc/common/tables/neutron-embrane_lb.xml
new file mode 100644
index 0000000000..cb2b31c7ae
--- /dev/null
+++ b/doc/common/tables/neutron-embrane_lb.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+        <!-- Warning: Do not edit this file. It is automatically
+             generated and your changes will be overwritten.
+             The tool to do so lives in the tools directory of this
+             repository -->
+        <para xmlns="http://docbook.org/ns/docbook" version="5.0">
+        <table rules="all" xml:id="config_table_neutron_embrane_lb">
+          <caption>Description of configuration options for embrane_lb</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">[heleoslb]</th>
+              </tr>
+              <tr>
+                       <td>admin_password = None</td>
+                       <td>(StrOpt) ESM admin password.</td>
+              </tr>
+              <tr>
+                       <td>admin_username = None</td>
+                       <td>(StrOpt) ESM admin username.</td>
+              </tr>
+              <tr>
+                       <td>async_requests = None</td>
+                       <td>(BoolOpt) Define if the requests have run asynchronously or not</td>
+              </tr>
+              <tr>
+                       <td>dummy_utif_id = None</td>
+                       <td>(StrOpt) Dummy user traffic Security Zone id for LBs</td>
+              </tr>
+              <tr>
+                       <td>esm_mgmt = None</td>
+                       <td>(StrOpt) ESM management root address</td>
+              </tr>
+              <tr>
+                       <td>inband_id = None</td>
+                       <td>(StrOpt) In band Security Zone id for LBs</td>
+              </tr>
+              <tr>
+                       <td>lb_flavor = small</td>
+                       <td>(StrOpt) choose LB image flavor to use, accepted values: small, medium</td>
+              </tr>
+              <tr>
+                       <td>lb_image = None</td>
+                       <td>(StrOpt) Load Balancer image id (Embrane LB)</td>
+              </tr>
+              <tr>
+                       <td>mgmt_id = None</td>
+                       <td>(StrOpt) Management Security Zone id for LBs</td>
+              </tr>
+              <tr>
+                       <td>oob_id = None</td>
+                       <td>(StrOpt) Out of band Security Zone id for LBs</td>
+              </tr>
+              <tr>
+                       <td>resource_pool_id = None</td>
+                       <td>(StrOpt) Shared resource pool id</td>
+              </tr>
+              <tr>
+                       <td>sync_interval = 60</td>
+                       <td>(IntOpt) resource synchronization interval in seconds</td>
+              </tr>
+       </tbody>
+        </table>
+        </para>
diff --git a/doc/common/tables/neutron-fwaas.xml b/doc/common/tables/neutron-fwaas.xml
index d6a57ef1b7..d7de3da7fe 100644
--- a/doc/common/tables/neutron-fwaas.xml
+++ b/doc/common/tables/neutron-fwaas.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_fwaas">
           <caption>Description of configuration options for fwaas</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-hyperv_agent.xml b/doc/common/tables/neutron-hyperv_agent.xml
index e5a099e4f7..ea27490740 100644
--- a/doc/common/tables/neutron-hyperv_agent.xml
+++ b/doc/common/tables/neutron-hyperv_agent.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_hyperv_agent">
           <caption>Description of configuration options for hyperv_agent</caption>
            <col width="50%"/>
            <col width="50%"/>
@@ -26,6 +26,10 @@
                        <td>local_network_vswitch = private</td>
                        <td>(StrOpt) Private vswitch name used for local networks</td>
               </tr>
+              <tr>
+                       <td>metrics_max_retries = 100</td>
+                       <td>(IntOpt) Specifies the maximum number of retries to enable Hyper-V's port metrics collection. The agent will try to enable the feature once every polling_interval period for at most metrics_max_retries or until it succeedes.</td>
+              </tr>
               <tr>
                        <td>physical_network_vswitch_mappings = </td>
                        <td>(ListOpt) List of &lt;physical_network&gt;:&lt;vswitch&gt; where the physical networks can be expressed with wildcards, e.g.: ."*:external"</td>
diff --git a/doc/common/tables/neutron-kombu.xml b/doc/common/tables/neutron-kombu.xml
index 34b137bed9..c1d0d5d0b3 100644
--- a/doc/common/tables/neutron-kombu.xml
+++ b/doc/common/tables/neutron-kombu.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_kombu">
           <caption>Description of configuration options for kombu</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-l3_agent.xml b/doc/common/tables/neutron-l3_agent.xml
index 833d178ad7..f13afda9b6 100644
--- a/doc/common/tables/neutron-l3_agent.xml
+++ b/doc/common/tables/neutron-l3_agent.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_l3_agent">
           <caption>Description of configuration options for l3_agent</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-lbaas.xml b/doc/common/tables/neutron-lbaas.xml
index 3c81ed30c0..a16020ec03 100644
--- a/doc/common/tables/neutron-lbaas.xml
+++ b/doc/common/tables/neutron-lbaas.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_lbaas">
           <caption>Description of configuration options for lbaas</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-linuxbridge_agent.xml b/doc/common/tables/neutron-linuxbridge_agent.xml
index 987ee67671..c03c05a9b6 100644
--- a/doc/common/tables/neutron-linuxbridge_agent.xml
+++ b/doc/common/tables/neutron-linuxbridge_agent.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_linuxbridge_agent">
           <caption>Description of configuration options for linuxbridge_agent</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-logging.xml b/doc/common/tables/neutron-logging.xml
index dac6935cfc..19406fc48f 100644
--- a/doc/common/tables/neutron-logging.xml
+++ b/doc/common/tables/neutron-logging.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_logging">
           <caption>Description of configuration options for logging</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-meta.xml b/doc/common/tables/neutron-meta.xml
index 9c023ac7ae..0ce05d3eb0 100644
--- a/doc/common/tables/neutron-meta.xml
+++ b/doc/common/tables/neutron-meta.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_meta">
           <caption>Description of configuration options for meta</caption>
            <col width="50%"/>
            <col width="50%"/>
@@ -38,6 +38,10 @@
                        <td>plugin_list = </td>
                        <td>(StrOpt) List of plugins to load</td>
               </tr>
+              <tr>
+                       <td>rpc_flavor = </td>
+                       <td>(StrOpt) Flavor of which plugin handles RPC</td>
+              </tr>
               <tr>
                        <td>supported_extension_aliases = </td>
                        <td>(StrOpt) Supported extension aliases</td>
diff --git a/doc/common/tables/neutron-metadata.xml b/doc/common/tables/neutron-metadata.xml
index 7cc7d2f702..aa42d5eaf7 100644
--- a/doc/common/tables/neutron-metadata.xml
+++ b/doc/common/tables/neutron-metadata.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_metadata">
           <caption>Description of configuration options for metadata</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-metering_agent.xml b/doc/common/tables/neutron-metering_agent.xml
index 12c717a040..63e0c8cc11 100644
--- a/doc/common/tables/neutron-metering_agent.xml
+++ b/doc/common/tables/neutron-metering_agent.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_metering_agent">
           <caption>Description of configuration options for metering_agent</caption>
            <col width="50%"/>
            <col width="50%"/>
@@ -30,7 +30,7 @@
                   <th colspan="2">[AGENT]</th>
               </tr>
               <tr>
-                       <td>report_interval = 4</td>
+                       <td>report_interval = 30</td>
                        <td>(FloatOpt) Seconds between nodes reporting state to server; should be less than agent_down_time, best if it is half or less than agent_down_time.</td>
               </tr>
        </tbody>
diff --git a/doc/common/tables/neutron-midonet.xml b/doc/common/tables/neutron-midonet.xml
index 5f35e93905..3df3334cb0 100644
--- a/doc/common/tables/neutron-midonet.xml
+++ b/doc/common/tables/neutron-midonet.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_midonet">
           <caption>Description of configuration options for midonet</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-ml2.xml b/doc/common/tables/neutron-ml2.xml
index 1c458fbc59..0c2931014a 100644
--- a/doc/common/tables/neutron-ml2.xml
+++ b/doc/common/tables/neutron-ml2.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_ml2">
           <caption>Description of configuration options for ml2</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-ml2_arista.xml b/doc/common/tables/neutron-ml2_arista.xml
index 6fb16ec4c9..3dcd565159 100644
--- a/doc/common/tables/neutron-ml2_arista.xml
+++ b/doc/common/tables/neutron-ml2_arista.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_ml2_arista">
           <caption>Description of configuration options for ml2_arista</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-ml2_bigswitch.xml b/doc/common/tables/neutron-ml2_bigswitch.xml
new file mode 100644
index 0000000000..0449fe9578
--- /dev/null
+++ b/doc/common/tables/neutron-ml2_bigswitch.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+        <!-- Warning: Do not edit this file. It is automatically
+             generated and your changes will be overwritten.
+             The tool to do so lives in the tools directory of this
+             repository -->
+        <para xmlns="http://docbook.org/ns/docbook" version="5.0">
+        <table rules="all" xml:id="config_table_neutron_ml2_bigswitch">
+          <caption>Description of configuration options for ml2_bigswitch</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>node_override_vif_802.1qbg = </td>
+                       <td>(ListOpt) Nova compute nodes to manually set VIF type to 802.1qbg</td>
+              </tr>
+              <tr>
+                       <td>node_override_vif_802.1qbh = </td>
+                       <td>(ListOpt) Nova compute nodes to manually set VIF type to 802.1qbh</td>
+              </tr>
+              <tr>
+                       <td>node_override_vif_binding_failed = </td>
+                       <td>(ListOpt) Nova compute nodes to manually set VIF type to binding_failed</td>
+              </tr>
+              <tr>
+                       <td>node_override_vif_bridge = </td>
+                       <td>(ListOpt) Nova compute nodes to manually set VIF type to bridge</td>
+              </tr>
+              <tr>
+                       <td>node_override_vif_hostdev = </td>
+                       <td>(ListOpt) Nova compute nodes to manually set VIF type to hostdev</td>
+              </tr>
+              <tr>
+                       <td>node_override_vif_hyperv = </td>
+                       <td>(ListOpt) Nova compute nodes to manually set VIF type to hyperv</td>
+              </tr>
+              <tr>
+                       <td>node_override_vif_ivs = </td>
+                       <td>(ListOpt) Nova compute nodes to manually set VIF type to ivs</td>
+              </tr>
+              <tr>
+                       <td>node_override_vif_midonet = </td>
+                       <td>(ListOpt) Nova compute nodes to manually set VIF type to midonet</td>
+              </tr>
+              <tr>
+                       <td>node_override_vif_mlnx_direct = </td>
+                       <td>(ListOpt) Nova compute nodes to manually set VIF type to mlnx_direct</td>
+              </tr>
+              <tr>
+                       <td>node_override_vif_other = </td>
+                       <td>(ListOpt) Nova compute nodes to manually set VIF type to other</td>
+              </tr>
+              <tr>
+                       <td>node_override_vif_ovs = </td>
+                       <td>(ListOpt) Nova compute nodes to manually set VIF type to ovs</td>
+              </tr>
+              <tr>
+                       <td>node_override_vif_unbound = </td>
+                       <td>(ListOpt) Nova compute nodes to manually set VIF type to unbound</td>
+              </tr>
+              <tr>
+                       <td>vif_type = ovs</td>
+                       <td>(StrOpt) Virtual interface type to configure on Nova compute nodes</td>
+              </tr>
+              <tr>
+                       <td>vif_types = unbound, binding_failed, ovs, ivs, bridge, 802.1qbg, 802.1qbh, hyperv, midonet, mlnx_direct, hostdev, other</td>
+                       <td>(ListOpt) List of allowed vif_type values.</td>
+              </tr>
+              <tr>
+                  <th colspan="2">[RESTPROXY]</th>
+              </tr>
+              <tr>
+                       <td>add_meta_server_route = True</td>
+                       <td>(BoolOpt) Flag to decide if a route to the metadata server should be injected into the VM</td>
+              </tr>
+              <tr>
+                       <td>auto_sync_on_failure = True</td>
+                       <td>(BoolOpt) If neutron fails to create a resource because the backend controller doesn't know of a dependency, automatically trigger a full data synchronization to the controller.</td>
+              </tr>
+              <tr>
+                       <td>cache_connections = True</td>
+                       <td>(BoolOpt) Re-use HTTP/HTTPS connections to the controller.</td>
+              </tr>
+              <tr>
+                       <td>consistency_interval = 60</td>
+                       <td>(IntOpt) Time between verifications that the backend controller database is consistent with Neutron</td>
+              </tr>
+              <tr>
+                       <td>neutron_id = neutron-ol</td>
+                       <td>(StrOpt) User defined identifier for this Neutron deployment</td>
+              </tr>
+              <tr>
+                       <td>no_ssl_validation = False</td>
+                       <td>(BoolOpt) Disables SSL certificate validation for controllers</td>
+              </tr>
+              <tr>
+                       <td>server_auth = None</td>
+                       <td>(StrOpt) The username and password for authenticating against  the BigSwitch or Floodlight controller.</td>
+              </tr>
+              <tr>
+                       <td>server_ssl = True</td>
+                       <td>(BoolOpt) If True, Use SSL when connecting to the BigSwitch or Floodlight controller.</td>
+              </tr>
+              <tr>
+                       <td>server_timeout = 10</td>
+                       <td>(IntOpt) Maximum number of seconds to wait for proxy request to connect and complete.</td>
+              </tr>
+              <tr>
+                       <td>servers = localhost:8800</td>
+                       <td>(ListOpt) A comma separated list of BigSwitch or Floodlight servers and port numbers. The plugin proxies the requests to the BigSwitch/Floodlight server, which performs the networking configuration. Only oneserver is needed per deployment, but you may wish todeploy multiple servers to support failover.</td>
+              </tr>
+              <tr>
+                       <td>ssl_cert_directory = /etc/neutron/plugins/bigswitch/ssl</td>
+                       <td>(StrOpt) Directory containing ca_certs and host_certs certificate directories.</td>
+              </tr>
+              <tr>
+                       <td>ssl_sticky = True</td>
+                       <td>(BoolOpt) Trust and store the first certificate received for each controller address and use it to validate future connections to that address.</td>
+              </tr>
+              <tr>
+                       <td>sync_data = False</td>
+                       <td>(BoolOpt) Sync data on connect</td>
+              </tr>
+              <tr>
+                       <td>thread_pool_size = 4</td>
+                       <td>(IntOpt) Maximum number of threads to spawn to handle large volumes of port creations.</td>
+              </tr>
+              <tr>
+                  <th colspan="2">[RESTPROXYAGENT]</th>
+              </tr>
+              <tr>
+                       <td>integration_bridge = br-int</td>
+                       <td>(StrOpt) Name of integration bridge on compute nodes used for security group insertion.</td>
+              </tr>
+              <tr>
+                       <td>polling_interval = 5</td>
+                       <td>(IntOpt) Seconds between agent checks for port changes</td>
+              </tr>
+              <tr>
+                       <td>virtual_switch_type = ovs</td>
+                       <td>(StrOpt) Virtual switch type.</td>
+              </tr>
+              <tr>
+                  <th colspan="2">[ROUTER]</th>
+              </tr>
+              <tr>
+                       <td>max_router_rules = 200</td>
+                       <td>(IntOpt) Maximum number of router rules</td>
+              </tr>
+              <tr>
+                       <td>tenant_default_router_rule = ['*:any:any:permit']</td>
+                       <td>(MultiStrOpt) The default router rules installed in new tenant routers. Repeat the config option for each rule. Format is &lt;tenant&gt;:&lt;source&gt;:&lt;destination&gt;:&lt;action&gt; Use an * to specify default for all tenants.</td>
+              </tr>
+       </tbody>
+        </table>
+        </para>
diff --git a/doc/common/tables/neutron-ml2_brocade.xml b/doc/common/tables/neutron-ml2_brocade.xml
index 3a3b37f2e0..b124762b0e 100644
--- a/doc/common/tables/neutron-ml2_brocade.xml
+++ b/doc/common/tables/neutron-ml2_brocade.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_ml2_brocade">
           <caption>Description of configuration options for ml2_brocade</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-ml2_cisco.xml b/doc/common/tables/neutron-ml2_cisco.xml
index 1bdfbf8cde..ceb7f0e447 100644
--- a/doc/common/tables/neutron-ml2_cisco.xml
+++ b/doc/common/tables/neutron-ml2_cisco.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_ml2_cisco">
           <caption>Description of configuration options for ml2_cisco</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-ml2_flat.xml b/doc/common/tables/neutron-ml2_flat.xml
index 40350e9a7c..f1445a9f3b 100644
--- a/doc/common/tables/neutron-ml2_flat.xml
+++ b/doc/common/tables/neutron-ml2_flat.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_ml2_flat">
           <caption>Description of configuration options for ml2_flat</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-ml2_gre.xml b/doc/common/tables/neutron-ml2_gre.xml
new file mode 100644
index 0000000000..1b36d8c5de
--- /dev/null
+++ b/doc/common/tables/neutron-ml2_gre.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+        <!-- Warning: Do not edit this file. It is automatically
+             generated and your changes will be overwritten.
+             The tool to do so lives in the tools directory of this
+             repository -->
+        <para xmlns="http://docbook.org/ns/docbook" version="5.0">
+        <table rules="all" xml:id="config_table_neutron_ml2_gre">
+          <caption>Description of configuration options for ml2_gre</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">[ml2_type_gre]</th>
+              </tr>
+              <tr>
+                       <td>tunnel_id_ranges = </td>
+                       <td>(ListOpt) Comma-separated list of &lt;tun_min&gt;:&lt;tun_max&gt; tuples enumerating ranges of GRE tunnel IDs that are available for tenant network allocation</td>
+              </tr>
+       </tbody>
+        </table>
+        </para>
diff --git a/doc/common/tables/neutron-ml2_l2pop.xml b/doc/common/tables/neutron-ml2_l2pop.xml
index 195ca9e19c..21f031baba 100644
--- a/doc/common/tables/neutron-ml2_l2pop.xml
+++ b/doc/common/tables/neutron-ml2_l2pop.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_ml2_l2pop">
           <caption>Description of configuration options for ml2_l2pop</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-ml2_ncs.xml b/doc/common/tables/neutron-ml2_ncs.xml
index e1abad5084..cc3e37a8bf 100644
--- a/doc/common/tables/neutron-ml2_ncs.xml
+++ b/doc/common/tables/neutron-ml2_ncs.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_ml2_ncs">
           <caption>Description of configuration options for ml2_ncs</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-ml2_odl.xml b/doc/common/tables/neutron-ml2_odl.xml
index 59e37d8552..9f19db40e3 100644
--- a/doc/common/tables/neutron-ml2_odl.xml
+++ b/doc/common/tables/neutron-ml2_odl.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_ml2_odl">
           <caption>Description of configuration options for ml2_odl</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-ml2_vlan.xml b/doc/common/tables/neutron-ml2_vlan.xml
new file mode 100644
index 0000000000..8e445ad1f1
--- /dev/null
+++ b/doc/common/tables/neutron-ml2_vlan.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+        <!-- Warning: Do not edit this file. It is automatically
+             generated and your changes will be overwritten.
+             The tool to do so lives in the tools directory of this
+             repository -->
+        <para xmlns="http://docbook.org/ns/docbook" version="5.0">
+        <table rules="all" xml:id="config_table_neutron_ml2_vlan">
+          <caption>Description of configuration options for ml2_vlan</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">[ml2_type_vlan]</th>
+              </tr>
+              <tr>
+                       <td>network_vlan_ranges = </td>
+                       <td>(ListOpt) List of &lt;physical_network&gt;:&lt;vlan_min&gt;:&lt;vlan_max&gt; or &lt;physical_network&gt; specifying physical_network names usable for VLAN provider and tenant networks, as well as ranges of VLAN tags on each available for allocation to tenant networks.</td>
+              </tr>
+       </tbody>
+        </table>
+        </para>
diff --git a/doc/common/tables/neutron-ml2_vxlan.xml b/doc/common/tables/neutron-ml2_vxlan.xml
index 0f7b0fe01a..2a915752a4 100644
--- a/doc/common/tables/neutron-ml2_vxlan.xml
+++ b/doc/common/tables/neutron-ml2_vxlan.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_ml2_vxlan">
           <caption>Description of configuration options for ml2_vxlan</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-mlnx.xml b/doc/common/tables/neutron-mlnx.xml
index 0be2627a4c..34a033015c 100644
--- a/doc/common/tables/neutron-mlnx.xml
+++ b/doc/common/tables/neutron-mlnx.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_mlnx">
           <caption>Description of configuration options for mlnx</caption>
            <col width="50%"/>
            <col width="50%"/>
@@ -18,6 +18,10 @@
               <tr>
                   <th colspan="2">[ESWITCH]</th>
               </tr>
+              <tr>
+                       <td>apply_profile_patch = False</td>
+                       <td>(BoolOpt) Enable server compatibility with old nova</td>
+              </tr>
               <tr>
                        <td>backoff_rate = 2</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>
diff --git a/doc/common/tables/neutron-nec.xml b/doc/common/tables/neutron-nec.xml
index 0fd4769aa1..fd71ecd9f7 100644
--- a/doc/common/tables/neutron-nec.xml
+++ b/doc/common/tables/neutron-nec.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_nec">
           <caption>Description of configuration options for nec</caption>
            <col width="50%"/>
            <col width="50%"/>
@@ -18,6 +18,10 @@
               <tr>
                   <th colspan="2">[OFC]</th>
               </tr>
+              <tr>
+                       <td>api_max_attempts = 3</td>
+                       <td>(IntOpt) Maximum attempts per OFC API request.NEC plugin retries API request to OFC when OFC returns ServiceUnavailable (503).The value must be greater than 0.</td>
+              </tr>
               <tr>
                        <td>cert_file = None</td>
                        <td>(StrOpt) Certificate file</td>
@@ -34,6 +38,10 @@
                        <td>host = 127.0.0.1</td>
                        <td>(StrOpt) Host to connect to</td>
               </tr>
+              <tr>
+                       <td>key_file = None</td>
+                       <td>(StrOpt) Key file</td>
+              </tr>
               <tr>
                        <td>port = 8888</td>
                        <td>(StrOpt) Port to connect to</td>
diff --git a/doc/common/tables/neutron-notifier.xml b/doc/common/tables/neutron-notifier.xml
index 14e910c184..41463d020d 100644
--- a/doc/common/tables/neutron-notifier.xml
+++ b/doc/common/tables/neutron-notifier.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_notifier">
           <caption>Description of configuration options for notifier</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-nuage.xml b/doc/common/tables/neutron-nuage.xml
new file mode 100644
index 0000000000..66cd3c1222
--- /dev/null
+++ b/doc/common/tables/neutron-nuage.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+        <!-- Warning: Do not edit this file. It is automatically
+             generated and your changes will be overwritten.
+             The tool to do so lives in the tools directory of this
+             repository -->
+        <para xmlns="http://docbook.org/ns/docbook" version="5.0">
+        <table rules="all" xml:id="config_table_neutron_nuage">
+          <caption>Description of configuration options for nuage</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">[RESTPROXY]</th>
+              </tr>
+              <tr>
+                       <td>auth_resource = </td>
+                       <td>(StrOpt) Nuage provided uri for initial authorization to access VSD</td>
+              </tr>
+              <tr>
+                       <td>base_uri = /</td>
+                       <td>(StrOpt) Nuage provided base uri to reach out to VSD</td>
+              </tr>
+              <tr>
+                       <td>default_floatingip_quota = 254</td>
+                       <td>(IntOpt) Per Net Partition quota of floating ips</td>
+              </tr>
+              <tr>
+                       <td>default_net_partition_name = OpenStackDefaultNetPartition</td>
+                       <td>(StrOpt) Default Network partition in which VSD will orchestrate network resources using openstack</td>
+              </tr>
+              <tr>
+                       <td>organization = system</td>
+                       <td>(StrOpt) Organization name in which VSD will orchestrate network resources using openstack</td>
+              </tr>
+              <tr>
+                       <td>server = localhost:8800</td>
+                       <td>(StrOpt) IP Address and Port of Nuage's VSD server</td>
+              </tr>
+              <tr>
+                       <td>serverauth = username:password</td>
+                       <td>(StrOpt) Username and password for authentication</td>
+              </tr>
+              <tr>
+                       <td>serverssl = False</td>
+                       <td>(BoolOpt) Boolean for SSL connection with VSD server</td>
+              </tr>
+       </tbody>
+        </table>
+        </para>
diff --git a/doc/common/tables/neutron-nvsd.xml b/doc/common/tables/neutron-nvsd.xml
index efc6cd5fad..0151b16bd8 100644
--- a/doc/common/tables/neutron-nvsd.xml
+++ b/doc/common/tables/neutron-nvsd.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_nvsd">
           <caption>Description of configuration options for nvsd</caption>
            <col width="50%"/>
            <col width="50%"/>
@@ -15,6 +15,13 @@
               </tr>
           </thead>
           <tbody>
+              <tr>
+                  <th colspan="2">[AGENT]</th>
+              </tr>
+              <tr>
+                       <td>integration_bridge = br-int</td>
+                       <td>(StrOpt) integration bridge</td>
+              </tr>
               <tr>
                   <th colspan="2">[nvsd]</th>
               </tr>
diff --git a/doc/common/tables/neutron-ofa_agent.xml b/doc/common/tables/neutron-ofa_agent.xml
new file mode 100644
index 0000000000..2406ca14a3
--- /dev/null
+++ b/doc/common/tables/neutron-ofa_agent.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+        <!-- Warning: Do not edit this file. It is automatically
+             generated and your changes will be overwritten.
+             The tool to do so lives in the tools directory of this
+             repository -->
+        <para xmlns="http://docbook.org/ns/docbook" version="5.0">
+        <table rules="all" xml:id="config_table_neutron_ofa_agent">
+          <caption>Description of configuration options for ofa_agent</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>ofp-listen-host = </td>
+                       <td>(StrOpt) openflow listen host</td>
+              </tr>
+              <tr>
+                       <td>ofp-ssl-listen-port = 6633</td>
+                       <td>(IntOpt) openflow ssl listen port</td>
+              </tr>
+              <tr>
+                       <td>ofp-tcp-listen-port = 6633</td>
+                       <td>(IntOpt) openflow tcp listen port</td>
+              </tr>
+              <tr>
+                  <th colspan="2">[AGENT]</th>
+              </tr>
+              <tr>
+                       <td>get_datapath_retry_times = 60</td>
+                       <td>(IntOpt) Number of seconds to retry acquiring an Open vSwitch datapath</td>
+              </tr>
+       </tbody>
+        </table>
+        </para>
diff --git a/doc/common/tables/neutron-openvswitch_agent.xml b/doc/common/tables/neutron-openvswitch_agent.xml
index 2bcb0ca9a8..2745c69799 100644
--- a/doc/common/tables/neutron-openvswitch_agent.xml
+++ b/doc/common/tables/neutron-openvswitch_agent.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_openvswitch_agent">
           <caption>Description of configuration options for openvswitch_agent</caption>
            <col width="50%"/>
            <col width="50%"/>
@@ -18,18 +18,6 @@
               <tr>
                   <th colspan="2">[DEFAULT]</th>
               </tr>
-              <tr>
-                       <td>ofp-listen-host = </td>
-                       <td>(StrOpt) openflow listen host</td>
-              </tr>
-              <tr>
-                       <td>ofp-ssl-listen-port = 6633</td>
-                       <td>(IntOpt) openflow ssl listen port</td>
-              </tr>
-              <tr>
-                       <td>ofp-tcp-listen-port = 6633</td>
-                       <td>(IntOpt) openflow tcp listen port</td>
-              </tr>
               <tr>
                        <td>ovs_integration_bridge = br-int</td>
                        <td>(StrOpt) Name of Open vSwitch bridge to use</td>
@@ -45,10 +33,6 @@
               <tr>
                   <th colspan="2">[AGENT]</th>
               </tr>
-              <tr>
-                       <td>get_datapath_retry_times = 60</td>
-                       <td>(IntOpt) Number of seconds to retry acquiring an Open vSwitch datapath</td>
-              </tr>
               <tr>
                        <td>l2_population = False</td>
                        <td>(BoolOpt) Use ml2 l2population mechanism driver to learn remote mac and IPs and improve tunnel scalability</td>
@@ -76,26 +60,10 @@
               <tr>
                   <th colspan="2">[CISCO_N1K]</th>
               </tr>
-              <tr>
-                       <td>bridge_mappings = </td>
-                       <td>(StrOpt) N1K Bridge Mappings</td>
-              </tr>
-              <tr>
-                       <td>enable_tunneling = True</td>
-                       <td>(BoolOpt) N1K Enable Tunneling</td>
-              </tr>
-              <tr>
-                       <td>integration_bridge = br-int</td>
-                       <td>(StrOpt) N1K Integration Bridge</td>
-              </tr>
               <tr>
                        <td>local_ip = 10.0.0.3</td>
                        <td>(StrOpt) N1K Local IP</td>
               </tr>
-              <tr>
-                       <td>tunnel_bridge = br-tun</td>
-                       <td>(StrOpt) N1K Tunnel Bridge</td>
-              </tr>
               <tr>
                   <th colspan="2">[OVS]</th>
               </tr>
@@ -143,20 +111,6 @@
                        <td>tunnel_type = </td>
                        <td>(StrOpt) The type of tunnels to use when utilizing tunnels, either 'gre' or 'vxlan'</td>
               </tr>
-              <tr>
-                  <th colspan="2">[ml2_type_gre]</th>
-              </tr>
-              <tr>
-                       <td>tunnel_id_ranges = </td>
-                       <td>(ListOpt) Comma-separated list of &lt;tun_min&gt;:&lt;tun_max&gt; tuples enumerating ranges of GRE tunnel IDs that are available for tenant network allocation</td>
-              </tr>
-              <tr>
-                  <th colspan="2">[ml2_type_vlan]</th>
-              </tr>
-              <tr>
-                       <td>network_vlan_ranges = </td>
-                       <td>(ListOpt) List of &lt;physical_network&gt;:&lt;vlan_min&gt;:&lt;vlan_max&gt; or &lt;physical_network&gt; specifying physical_network names usable for VLAN provider and tenant networks, as well as ranges of VLAN tags on each available for allocation to tenant networks.</td>
-              </tr>
        </tbody>
         </table>
         </para>
diff --git a/doc/common/tables/neutron-plumgrid.xml b/doc/common/tables/neutron-plumgrid.xml
index 59a6c8d258..5685e9e917 100644
--- a/doc/common/tables/neutron-plumgrid.xml
+++ b/doc/common/tables/neutron-plumgrid.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_plumgrid">
           <caption>Description of configuration options for plumgrid</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-policy.xml b/doc/common/tables/neutron-policy.xml
index 2699b2d4d2..76a95ae023 100644
--- a/doc/common/tables/neutron-policy.xml
+++ b/doc/common/tables/neutron-policy.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_policy">
           <caption>Description of configuration options for policy</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-qpid.xml b/doc/common/tables/neutron-qpid.xml
index d0ec72f3a8..06ad2dcdfe 100644
--- a/doc/common/tables/neutron-qpid.xml
+++ b/doc/common/tables/neutron-qpid.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_qpid">
           <caption>Description of configuration options for qpid</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-quotas.xml b/doc/common/tables/neutron-quotas.xml
index 936bfa9401..ae213706f9 100644
--- a/doc/common/tables/neutron-quotas.xml
+++ b/doc/common/tables/neutron-quotas.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_quotas">
           <caption>Description of configuration options for quotas</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-rabbitmq.xml b/doc/common/tables/neutron-rabbitmq.xml
index 3b86abef4c..7e3be7d7cf 100644
--- a/doc/common/tables/neutron-rabbitmq.xml
+++ b/doc/common/tables/neutron-rabbitmq.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_rabbitmq">
           <caption>Description of configuration options for rabbitmq</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-redis.xml b/doc/common/tables/neutron-redis.xml
index d862e2ef0a..6ffe69a42c 100644
--- a/doc/common/tables/neutron-redis.xml
+++ b/doc/common/tables/neutron-redis.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_redis">
           <caption>Description of configuration options for redis</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-rpc.xml b/doc/common/tables/neutron-rpc.xml
index 2082bf50bd..4f2cdfffcd 100644
--- a/doc/common/tables/neutron-rpc.xml
+++ b/doc/common/tables/neutron-rpc.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_rpc">
           <caption>Description of configuration options for rpc</caption>
            <col width="50%"/>
            <col width="50%"/>
@@ -83,17 +83,6 @@
                        <td>topics = notifications</td>
                        <td>(ListOpt) AMQP topic(s) used for openstack notifications</td>
               </tr>
-              <tr>
-                  <th colspan="2">[DEFAULT]</th>
-              </tr>
-              <tr>
-                       <td>port = 6379</td>
-                       <td>(IntOpt) Use this port to connect to redis host.</td>
-              </tr>
-              <tr>
-                       <td>password = None</td>
-                       <td>(StrOpt) Password for Redis server. (optional)</td>
-              </tr>
        </tbody>
         </table>
         </para>
diff --git a/doc/common/tables/neutron-ryu.xml b/doc/common/tables/neutron-ryu.xml
index ddb8a214ac..3287e229c7 100644
--- a/doc/common/tables/neutron-ryu.xml
+++ b/doc/common/tables/neutron-ryu.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_ryu">
           <caption>Description of configuration options for ryu</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-scheduler.xml b/doc/common/tables/neutron-scheduler.xml
index 230e7ef80b..e937143b70 100644
--- a/doc/common/tables/neutron-scheduler.xml
+++ b/doc/common/tables/neutron-scheduler.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_scheduler">
           <caption>Description of configuration options for scheduler</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-sdnve.xml b/doc/common/tables/neutron-sdnve.xml
index 970c443850..fb911c5cb6 100644
--- a/doc/common/tables/neutron-sdnve.xml
+++ b/doc/common/tables/neutron-sdnve.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_sdnve">
           <caption>Description of configuration options for sdnve</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-securitygroups.xml b/doc/common/tables/neutron-securitygroups.xml
index 2408767880..756d7f9bf7 100644
--- a/doc/common/tables/neutron-securitygroups.xml
+++ b/doc/common/tables/neutron-securitygroups.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_securitygroups">
           <caption>Description of configuration options for securitygroups</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-ssl.xml b/doc/common/tables/neutron-ssl.xml
index e2542c73d7..9a36f47d3d 100644
--- a/doc/common/tables/neutron-ssl.xml
+++ b/doc/common/tables/neutron-ssl.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_ssl">
           <caption>Description of configuration options for ssl</caption>
            <col width="50%"/>
            <col width="50%"/>
@@ -30,13 +30,6 @@
                        <td>ssl_key_file = None</td>
                        <td>(StrOpt) Private key file to use when starting the server securely</td>
               </tr>
-              <tr>
-                  <th colspan="2">[OFC]</th>
-              </tr>
-              <tr>
-                       <td>key_file = None</td>
-                       <td>(StrOpt) Key file</td>
-              </tr>
               <tr>
                   <th colspan="2">[ssl]</th>
               </tr>
diff --git a/doc/common/tables/neutron-testing.xml b/doc/common/tables/neutron-testing.xml
index 17cdee021a..14725d4f13 100644
--- a/doc/common/tables/neutron-testing.xml
+++ b/doc/common/tables/neutron-testing.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_testing">
           <caption>Description of configuration options for testing</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-varmour.xml b/doc/common/tables/neutron-varmour.xml
index d6f2f22798..2df7145616 100644
--- a/doc/common/tables/neutron-varmour.xml
+++ b/doc/common/tables/neutron-varmour.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_varmour">
           <caption>Description of configuration options for varmour</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-vmware.xml b/doc/common/tables/neutron-vmware.xml
index 16aa2b6539..cf9616afc2 100644
--- a/doc/common/tables/neutron-vmware.xml
+++ b/doc/common/tables/neutron-vmware.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_vmware">
           <caption>Description of configuration options for vmware</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-vpn.xml b/doc/common/tables/neutron-vpn.xml
index 23f4042a53..7819fb1c5a 100644
--- a/doc/common/tables/neutron-vpn.xml
+++ b/doc/common/tables/neutron-vpn.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_vpn">
           <caption>Description of configuration options for vpn</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-wsgi.xml b/doc/common/tables/neutron-wsgi.xml
index f3bee9a84c..328e507f0f 100644
--- a/doc/common/tables/neutron-wsgi.xml
+++ b/doc/common/tables/neutron-wsgi.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_wsgi">
           <caption>Description of configuration options for wsgi</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/neutron-zeromq.xml b/doc/common/tables/neutron-zeromq.xml
index fde3138b36..4f7f88156b 100644
--- a/doc/common/tables/neutron-zeromq.xml
+++ b/doc/common/tables/neutron-zeromq.xml
@@ -4,7 +4,7 @@
              The tool to do so lives in the tools directory of this
              repository -->
         <para xmlns="http://docbook.org/ns/docbook" version="5.0">
-        <table rules="all">
+        <table rules="all" xml:id="config_table_neutron_zeromq">
           <caption>Description of configuration options for zeromq</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/config-reference/networking/section_networking-plugins-ml2.xml b/doc/config-reference/networking/section_networking-plugins-ml2.xml
index f4675fd475..624eda472c 100644
--- a/doc/config-reference/networking/section_networking-plugins-ml2.xml
+++ b/doc/config-reference/networking/section_networking-plugins-ml2.xml
@@ -63,8 +63,7 @@
     <section xml:id="networking-plugin-ml2_bigswitch">
         <title>Modular Layer 2 (ml2) BigSwitch Mechanism configuration
             options</title>
-        <xi:include href="../../common/tables/neutron-bigswitch.xml"
-        />
+        <xi:include href="../../common/tables/neutron-ml2_bigswitch.xml"/>
     </section>
     <section xml:id="networking-plugin-ml2_brocade">
         <title>Modular Layer 2 (ml2) Brocade Mechanism configuration
diff --git a/doc/config-reference/networking/section_networking-plugins.xml b/doc/config-reference/networking/section_networking-plugins.xml
index afe10ad07a..9198d20e23 100644
--- a/doc/config-reference/networking/section_networking-plugins.xml
+++ b/doc/config-reference/networking/section_networking-plugins.xml
@@ -70,15 +70,6 @@
                            href="../../common/tables/neutron-meta.xml"
                   />
          </section>
-         <section xml:id="networking-plugin-metadata">
-                  <title>Metadata Agent configuration options</title>
-                  <para>The Metadata Agent acts as a proxy for the Compute
-                           metadata service
-                           plug-ins at the same time.</para>
-                  <xi:include
-                           href="../../common/tables/neutron-metadata.xml"
-                  />
-         </section>
          <xi:include href="section_networking-plugins-ml2.xml"/>
          <section xml:id="networking-plugin-midonet">
                   <title>MidoNet configuration options</title>
@@ -92,6 +83,12 @@
                            href="../../common/tables/neutron-nec.xml"
                   />
          </section>
+         <section xml:id="networking-plugin-nuage">
+                  <title>Nuage configuration options</title>
+                  <xi:include
+                           href="../../common/tables/neutron-nuage.xml"
+                  />
+         </section>
          <section xml:id="networking-plugin-nvsd">
                   <title>One Convergence NVSD configuration options</title>
                   <xi:include
diff --git a/tools/autogenerate-config-flagmappings/neutron.flagmappings b/tools/autogenerate-config-flagmappings/neutron.flagmappings
index 94b23da8d9..e6364960ca 100644
--- a/tools/autogenerate-config-flagmappings/neutron.flagmappings
+++ b/tools/autogenerate-config-flagmappings/neutron.flagmappings
@@ -102,15 +102,23 @@ network_device_mtu agent
 network_scheduler_driver scheduler
 notification_driver notifier
 notification_topics notifier
+notify_nova_on_port_data_changes compute
+notify_nova_on_port_status_changes compute
+nova_admin_auth_url compute
+nova_admin_password compute
+nova_admin_tenant_id compute
+nova_admin_username compute
 nova_metadata_ip metadata
 nova_metadata_port metadata
+nova_region_name compute
+nova_url compute
 nsx_controllers vmware
 nsx_password vmware
 nsx_user vmware
 num_sync_threads dhcp_agent
-ofp_listen_host openvswitch_agent
-ofp_ssl_listen_port openvswitch_agent
-ofp_tcp_listen_port openvswitch_agent
+ofp_listen_host ofa_agent
+ofp_ssl_listen_port ofa_agent
+ofp_tcp_listen_port ofa_agent
 ovs_integration_bridge openvswitch_agent
 ovs_use_veth openvswitch_agent
 ovs_vsctl_timeout openvswitch_agent
@@ -166,6 +174,7 @@ rpc_zmq_port zeromq
 rpc_zmq_topic_backlog zeromq
 run_external_periodic_tasks api
 send_arp_for_ha l3_agent
+send_events_interval compute
 service_plugins api
 sqlite_db db
 sqlite_synchronous db
@@ -181,9 +190,11 @@ use_stderr logging
 use_syslog logging
 verbose logging
 AGENT/enable_metrics_collection hyperv_agent
-AGENT/get_datapath_retry_times openvswitch_agent
+AGENT/get_datapath_retry_times ofa_agent
+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_network_vswitch_mappings hyperv_agent
@@ -202,20 +213,21 @@ CISCO/provider_vlan_auto_trunk cisco
 CISCO/provider_vlan_name_prefix cisco
 CISCO/svi_round_robin cisco
 CISCO/vlan_name_prefix cisco
-CISCO_N1K/bridge_mappings openvswitch_agent
+CISCO_N1K/bridge_mappings cisco
 CISCO_N1K/default_network_profile cisco
 CISCO_N1K/default_policy_profile cisco
-CISCO_N1K/enable_tunneling openvswitch_agent
-CISCO_N1K/integration_bridge openvswitch_agent
+CISCO_N1K/enable_tunneling cisco
+CISCO_N1K/integration_bridge cisco
 CISCO_N1K/local_ip openvswitch_agent
 CISCO_N1K/network_node_policy_profile cisco
 CISCO_N1K/network_vlan_ranges cisco
 CISCO_N1K/poll_duration cisco
 CISCO_N1K/tenant_network_type cisco
-CISCO_N1K/tunnel_bridge openvswitch_agent
+CISCO_N1K/tunnel_bridge cisco
 CISCO_N1K/vxlan_id_ranges cisco
 CISCO_PLUGINS/nexus_plugin cisco
 CISCO_PLUGINS/vswitch_plugin cisco
+ESWITCH/apply_profile_patch mlnx
 ESWITCH/backoff_rate mlnx
 ESWITCH/daemon_endpoint mlnx
 ESWITCH/physical_interface_mappings mlnx
@@ -230,6 +242,7 @@ META/default_l3_flavor meta
 META/extension_map meta
 META/l3_plugin_list meta
 META/plugin_list meta
+META/rpc_flavor meta
 META/supported_extension_aliases meta
 MIDONET/midonet_host_uuid_path midonet
 MIDONET/midonet_uri midonet
@@ -242,20 +255,20 @@ MLNX/network_vlan_ranges mlnx
 MLNX/physical_network_type mlnx
 MLNX/physical_network_type_mappings mlnx
 MLNX/tenant_network_type mlnx
-NOVA/node_override_vif_802.1qbg bigswitch
-NOVA/node_override_vif_802.1qbh bigswitch
-NOVA/node_override_vif_binding_failed bigswitch
-NOVA/node_override_vif_bridge bigswitch
-NOVA/node_override_vif_hostdev bigswitch
-NOVA/node_override_vif_hyperv bigswitch
-NOVA/node_override_vif_ivs bigswitch
-NOVA/node_override_vif_midonet bigswitch
-NOVA/node_override_vif_mlnx_direct bigswitch
-NOVA/node_override_vif_other bigswitch
-NOVA/node_override_vif_ovs bigswitch
-NOVA/node_override_vif_unbound bigswitch
-NOVA/vif_type bigswitch
-NOVA/vif_types bigswitch
+NOVA/node_override_vif_802.1qbg bigswitch ml2_bigswitch
+NOVA/node_override_vif_802.1qbh bigswitch ml2_bigswitch
+NOVA/node_override_vif_binding_failed bigswitch ml2_bigswitch
+NOVA/node_override_vif_bridge bigswitch ml2_bigswitch
+NOVA/node_override_vif_hostdev bigswitch ml2_bigswitch
+NOVA/node_override_vif_hyperv bigswitch ml2_bigswitch
+NOVA/node_override_vif_ivs bigswitch ml2_bigswitch
+NOVA/node_override_vif_midonet bigswitch ml2_bigswitch
+NOVA/node_override_vif_mlnx_direct bigswitch ml2_bigswitch
+NOVA/node_override_vif_other bigswitch ml2_bigswitch
+NOVA/node_override_vif_ovs bigswitch ml2_bigswitch
+NOVA/node_override_vif_unbound 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
@@ -275,11 +288,12 @@ 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
+OFC/api_max_attempts nec
 OFC/cert_file nec
 OFC/driver nec
 OFC/enable_packet_filter nec
 OFC/host nec
-OFC/key_file ssl
+OFC/key_file nec
 OFC/port nec
 OFC/use_ssl nec
 OVS/bridge_mappings openvswitch_agent
@@ -329,33 +343,33 @@ 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
-RESTPROXY/auth_resource bigswitch
-RESTPROXY/auto_sync_on_failure bigswitch
-RESTPROXY/base_uri bigswitch
-RESTPROXY/cache_connections bigswitch
-RESTPROXY/consistency_interval bigswitch
-RESTPROXY/default_floatingip_quota bigswitch
-RESTPROXY/default_net_partition_name bigswitch
-RESTPROXY/neutron_id bigswitch
-RESTPROXY/no_ssl_validation bigswitch
-RESTPROXY/organization bigswitch
-RESTPROXY/server bigswitch
-RESTPROXY/server_auth bigswitch
-RESTPROXY/server_ssl bigswitch
-RESTPROXY/server_timeout bigswitch
-RESTPROXY/serverauth bigswitch
-RESTPROXY/servers bigswitch
-RESTPROXY/serverssl bigswitch
-RESTPROXY/ssl_cert_directory bigswitch
-RESTPROXY/ssl_sticky bigswitch
-RESTPROXY/sync_data bigswitch
-RESTPROXY/thread_pool_size bigswitch
-RESTPROXYAGENT/integration_bridge bigswitch
-RESTPROXYAGENT/polling_interval bigswitch
-RESTPROXYAGENT/virtual_switch_type bigswitch
-ROUTER/max_router_rules bigswitch
-ROUTER/tenant_default_router_rule bigswitch
+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
+RESTPROXY/thread_pool_size bigswitch ml2_bigswitch
+RESTPROXYAGENT/integration_bridge bigswitch ml2_bigswitch
+RESTPROXYAGENT/polling_interval bigswitch ml2_bigswitch
+RESTPROXYAGENT/virtual_switch_type bigswitch ml2_bigswitch
+ROUTER/max_router_rules bigswitch ml2_bigswitch
+ROUTER/tenant_default_router_rule bigswitch ml2_bigswitch
 SDNVE/base_url sdnve
 SDNVE/controller_ips sdnve
 SDNVE/default_tenant_type sdnve
@@ -389,6 +403,7 @@ VXLAN/ttl linuxbridge_agent
 VXLAN/vxlan_group linuxbridge_agent
 audit/api_audit_map debug
 audit/namespace debug
+cisco_csr_ipsec/status_check_interval cisco
 database/backend db
 database/connection db
 database/connection_debug db
@@ -420,6 +435,18 @@ heleos/mgmt_id embrane
 heleos/oob_id embrane
 heleos/resource_pool_id embrane
 heleos/router_image embrane
+heleoslb/admin_password embrane_lb
+heleoslb/admin_username embrane_lb
+heleoslb/async_requests embrane_lb
+heleoslb/dummy_utif_id embrane_lb
+heleoslb/esm_mgmt embrane_lb
+heleoslb/inband_id embrane_lb
+heleoslb/lb_flavor embrane_lb
+heleoslb/lb_image embrane_lb
+heleoslb/mgmt_id embrane_lb
+heleoslb/oob_id embrane_lb
+heleoslb/resource_pool_id embrane_lb
+heleoslb/sync_interval embrane_lb
 hyperv/force_hyperv_utils_v1 hyperv_agent
 ipsec/config_base_dir vpn
 ipsec/ipsec_status_check_interval vpn
@@ -455,8 +482,8 @@ ml2_odl/timeout ml2_odl
 ml2_odl/url ml2_odl
 ml2_odl/username ml2_odl
 ml2_type_flat/flat_networks ml2_flat
-ml2_type_gre/tunnel_id_ranges openvswitch_agent
-ml2_type_vlan/network_vlan_ranges openvswitch_agent
+ml2_type_gre/tunnel_id_ranges ml2_gre
+ml2_type_vlan/network_vlan_ranges ml2_vlan
 ml2_type_vxlan/vni_ranges ml2_vxlan
 ml2_type_vxlan/vxlan_group ml2_vxlan
 netscaler_driver/netscaler_ncc_password lbaas
@@ -513,6 +540,3 @@ vcns/resource_pool_id vmware
 vcns/task_status_check_interval vmware
 vcns/user vmware
 vpnagent/vpn_device_driver vpn
-port rpc
-password rpc
-transport_url amqp