diff --git a/doc/common/tables/neutron-brocade_vyatta_l3.xml b/doc/common/tables/neutron-brocade_vyatta_l3.xml
new file mode 100644
index 0000000000..54b53c325d
--- /dev/null
+++ b/doc/common/tables/neutron-brocade_vyatta_l3.xml
@@ -0,0 +1,70 @@
+<?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_brocade_vyatta_l3">
+ <caption>Description of Brocade Vyatta L3 plug-in 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">[VROUTER]</th>
+ </tr>
+ <tr>
+ <td><option>flavor</option> = <replaceable>2</replaceable></td>
+ <td>(StrOpt) Nova VM flavor for instances of Vyatta vRouter.</td>
+ </tr>
+ <tr>
+ <td><option>image_id</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Nova image id for instances of Vyatta vRouter.</td>
+ </tr>
+ <tr>
+ <td><option>keystone_url</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Keystone URL.</td>
+ </tr>
+ <tr>
+ <td><option>management_network_id</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Vyatta vRouter management network id.</td>
+ </tr>
+ <tr>
+ <td><option>nova_poll_interval</option> = <replaceable>5</replaceable></td>
+ <td>(IntOpt) Number of seconds between consecutive Nova queries when waiting for router instance status change.</td>
+ </tr>
+ <tr>
+ <td><option>nova_spawn_timeout</option> = <replaceable>300</replaceable></td>
+ <td>(IntOpt) Number of seconds to wait for Nova to activate instance before setting resource to error state.</td>
+ </tr>
+ <tr>
+ <td><option>tenant_admin_name</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Name of tenant admin user.</td>
+ </tr>
+ <tr>
+ <td><option>tenant_admin_password</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) Tenant admin password.</td>
+ </tr>
+ <tr>
+ <td><option>tenant_id</option> = <replaceable>None</replaceable></td>
+ <td>(StrOpt) UUID of tenant that holds Vyatta vRouter instances.</td>
+ </tr>
+ <tr>
+ <td><option>vrouter_boot_timeout</option> = <replaceable>300</replaceable></td>
+ <td>(IntOpt) Number of seconds to wait for Vyatta vRouter to boot before setting resource to error state.</td>
+ </tr>
+ <tr>
+ <td><option>vrouter_credentials</option> = <replaceable>vyatta:vyatta</replaceable></td>
+ <td>(StrOpt) Vyatta vRouter login credentials</td>
+ </tr>
+ <tr>
+ <td><option>vrouter_poll_interval</option> = <replaceable>5</replaceable></td>
+ <td>(IntOpt) Number of seconds between consecutive Vyatta vRouter queries when waiting for router instance boot.</td>
+ </tr>
+ </tbody>
+ </table>
+</para>
diff --git a/doc/config-reference/networking/section_networking-plugins.xml b/doc/config-reference/networking/section_networking-plugins.xml
index 272d92ebdb..dd3e67a8ec 100644
--- a/doc/config-reference/networking/section_networking-plugins.xml
+++ b/doc/config-reference/networking/section_networking-plugins.xml
@@ -39,6 +39,17 @@
href="../../common/tables/neutron-brocade.xml"
/>
</section>
+ <section xml:id="networking-plugin-brocade_vyatta_l3">
+ <title>Brocade Vyatta layer 3 plug-in</title>
+ <para>The Brocade Vyatta Layer 3 plug-in configures Vyatta
+ vRouter. More information about the plug-in is available at: <link
+ xlink:href="https://wiki.openstack.org/wiki/Brocade_Vyatta_L3_Plugin"
+ >Brocade_Vyatta_L3_Plugin</link>.</para>
+ <para>Use the following options to configure the Brocade Vyatta Layer 3 plug-in.</para>
+ <xi:include
+ href="../../common/tables/neutron-brocade_vyatta_l3.xml"
+ />
+ </section>
<section xml:id="networking-plugin-cisco">
<title>CISCO configuration options</title>
<xi:include
diff --git a/tools/autogenerate-config-flagmappings/neutron.flagmappings b/tools/autogenerate-config-flagmappings/neutron.flagmappings
index d85857d48d..29b6abe406 100644
--- a/tools/autogenerate-config-flagmappings/neutron.flagmappings
+++ b/tools/autogenerate-config-flagmappings/neutron.flagmappings
@@ -413,6 +413,18 @@ SYNCMANAGER/enable_sync nuage
SYNCMANAGER/sync_interval nuage
VLANS/network_vlan_ranges linuxbridge_agent
VLANS/tenant_network_type linuxbridge_agent
+VROUTER/flavor brocade_vyatta_l3
+VROUTER/image_id brocade_vyatta_l3
+VROUTER/keystone_url brocade_vyatta_l3
+VROUTER/management_network_id brocade_vyatta_l3
+VROUTER/nova_poll_interval brocade_vyatta_l3
+VROUTER/nova_spawn_timeout brocade_vyatta_l3
+VROUTER/tenant_admin_name brocade_vyatta_l3
+VROUTER/tenant_admin_password brocade_vyatta_l3
+VROUTER/tenant_id brocade_vyatta_l3
+VROUTER/vrouter_boot_timeout brocade_vyatta_l3
+VROUTER/vrouter_credentials brocade_vyatta_l3
+VROUTER/vrouter_poll_interval brocade_vyatta_l3
VXLAN/enable_vxlan linuxbridge_agent
VXLAN/l2_population linuxbridge_agent
VXLAN/local_ip linuxbridge_agent
diff --git a/tools/autogenerate-config-flagmappings/neutron.headers b/tools/autogenerate-config-flagmappings/neutron.headers
index 1252920bd9..cf34b6aaf8 100644
--- a/tools/autogenerate-config-flagmappings/neutron.headers
+++ b/tools/autogenerate-config-flagmappings/neutron.headers
@@ -1,5 +1,6 @@
bigswitch BigSwitch
brocade Brocade
+brocade_vyatta_l3 Brocade Vyatta L3 plug-in
cfg_agent cfg agent
cisco Cisco
dhcp_agent DHCP agent