Neutron config ref update

Remove the amqp table (the transport_url option doesn't exist in neutron
anymore).

Rename the debug table to cadf, and include the table.

Change-Id: I718f50e2b9eaa5e6e4a20cf77f4d245dd6b6cc01
Closes-Bug: #1310061

doc/common/section_rpc-for-networking.xml

@@ -117,7 +117,6 @@ qpid_protocol=ssl
         <application>ZeroMq</application> messaging drivers:</para>
 
     <xi:include href="tables/neutron-rpc.xml"/>
-    <xi:include href="tables/neutron-amqp.xml"/>
     <xi:include href="tables/neutron-notifier.xml"/>
     <xi:include href="tables/neutron-redis.xml"/>
   </section>

doc/common/tables/neutron-amqp.xml

@@ -1,27 +0,0 @@
-<?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">
-          <caption>Description of configuration options for amqp</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>transport_url = None</td>
-                       <td>(StrOpt) A URL representing the messaging driver to use and its full configuration. If not set, we fall back to the rpc_backend option and driver specific configuration.</td>
-              </tr>
-       </tbody>
-        </table>
-        </para>

doc/common/tables/neutron-cadf.xml

@@ -4,8 +4,8 @@
              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_debug">
+        <table rules="all" xml:id="config_table_neutron_cadf">
-          <caption>Description of configuration options for debug</caption>
+          <caption>Description of configuration options for cadf</caption>
            <col width="50%"/>
            <col width="50%"/>
            <thead>

doc/common/tables/neutron-ml2_ofa.xml

@@ -4,8 +4,8 @@
              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">
+        <table rules="all" xml:id="config_table_neutron_ml2_ofa">
-          <caption>Description of configuration options for ofa_agent</caption>
+          <caption>Description of configuration options for ml2_ofa</caption>
            <col width="50%"/>
            <col width="50%"/>
            <thead>

doc/config-reference/networking/section_networking-options-reference.xml

@@ -33,6 +33,12 @@
 <xi:include href="../../common/tables/neutron-auth_token.xml"/>
 </section>
 
+<section xml:id="networking-options-cadf">
+<title>CADF</title>
+<para>Use the following options to alter Cloud Audit Data Federation (CADF) settings.</para>
+<xi:include href="../../common/tables/neutron-cadf.xml"/>
+</section>
+
 <section xml:id="networking-options-compute">
 <title>Compute</title>
 <para>Use the following options to alter Compute-related settings.</para>

tools/autogenerate-config-flagmappings/neutron.flagmappings

@@ -406,8 +406,8 @@ VXLAN/local_ip linuxbridge_agent
 VXLAN/tos linuxbridge_agent
 VXLAN/ttl linuxbridge_agent
 VXLAN/vxlan_group linuxbridge_agent
-audit/api_audit_map debug
+audit/api_audit_map cadf
-audit/namespace debug
+audit/namespace cadf
 cisco_csr_ipsec/status_check_interval cisco
 database/backend db
 database/connection db