From 4ae2e4c5e2c1c69e9dc795daa9119e892521ff0a Mon Sep 17 00:00:00 2001
From: Gauvain Pocentek <gauvain.pocentek@objectif-libre.com>
Date: Tue, 11 Mar 2014 18:55:55 +0100
Subject: [PATCH] update heat flags and tables

Change-Id: Ib32ecfab49a6de3dabda207ba2919a0c6ff63bba
---
 doc/common/tables/heat-amqp.xml                     |  6 +-----
 doc/common/tables/heat-api.xml                      | 12 ++++++------
 doc/common/tables/heat-cfn_api.xml                  | 10 +++++-----
 doc/common/tables/heat-clients.xml                  |  2 +-
 doc/common/tables/heat-clients_backends.xml         |  2 +-
 doc/common/tables/heat-clients_ceilometer.xml       |  2 +-
 doc/common/tables/heat-clients_cinder.xml           |  2 +-
 doc/common/tables/heat-clients_heat.xml             |  2 +-
 doc/common/tables/heat-clients_keystone.xml         |  2 +-
 doc/common/tables/heat-clients_neutron.xml          |  2 +-
 doc/common/tables/heat-clients_nova.xml             |  2 +-
 doc/common/tables/heat-clients_swift.xml            |  2 +-
 doc/common/tables/heat-clients_trove.xml            |  2 +-
 doc/common/tables/heat-cloudwatch_api.xml           | 10 +++++-----
 doc/common/tables/heat-common.xml                   |  2 +-
 doc/common/tables/heat-crypt.xml                    |  2 +-
 doc/common/tables/heat-database.xml                 |  2 +-
 doc/common/tables/heat-debug.xml                    |  2 +-
 doc/common/tables/heat-loadbalancer.xml             |  2 +-
 doc/common/tables/heat-logging.xml                  |  2 +-
 doc/common/tables/heat-metadata_api.xml             |  2 +-
 doc/common/tables/heat-notification.xml             |  2 +-
 doc/common/tables/heat-qpid.xml                     |  2 +-
 doc/common/tables/heat-quota.xml                    |  2 +-
 doc/common/tables/heat-rabbitmq.xml                 |  2 +-
 doc/common/tables/heat-redis.xml                    | 13 +------------
 doc/common/tables/heat-rpc.xml                      |  2 +-
 doc/common/tables/heat-waitcondition_api.xml        |  2 +-
 doc/common/tables/heat-zeromq.xml                   |  2 +-
 .../heat.flagmappings                               |  3 ---
 30 files changed, 42 insertions(+), 60 deletions(-)

diff --git a/doc/common/tables/heat-amqp.xml b/doc/common/tables/heat-amqp.xml
index dbf52e0820..aa08b8d008 100644
--- a/doc/common/tables/heat-amqp.xml
+++ b/doc/common/tables/heat-amqp.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_heat_amqp">
           <caption>Description of configuration options for amqp</caption>
            <col width="50%"/>
            <col width="50%"/>
@@ -54,10 +54,6 @@
                        <td>notification_topics = notifications</td>
                        <td>(ListOpt) AMQP topic used for OpenStack notifications</td>
               </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>
diff --git a/doc/common/tables/heat-api.xml b/doc/common/tables/heat-api.xml
index 0ae872798d..2880097c21 100644
--- a/doc/common/tables/heat-api.xml
+++ b/doc/common/tables/heat-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_heat_api">
           <caption>Description of configuration options for api</caption>
            <col width="50%"/>
            <col width="50%"/>
@@ -52,7 +52,7 @@
               </tr>
               <tr>
                        <td>stack_domain_admin = None</td>
-                       <td>(StrOpt) Keystone username, a user with roles sufficient to manageusers and projects in the stack_user_domain.</td>
+                       <td>(StrOpt) Keystone username, a user with roles sufficient to manage users and projects in the stack_user_domain.</td>
               </tr>
               <tr>
                        <td>stack_domain_admin_password = None</td>
@@ -101,7 +101,7 @@
               </tr>
               <tr>
                        <td>bind_host = 0.0.0.0</td>
-                       <td>(StrOpt) Address to bind the server.  Useful when selecting a particular network interface.</td>
+                       <td>(StrOpt) Address to bind the server. Useful when selecting a particular network interface.</td>
               </tr>
               <tr>
                        <td>bind_port = 8004</td>
@@ -109,15 +109,15 @@
               </tr>
               <tr>
                        <td>cert_file = None</td>
-                       <td>(StrOpt) Location of the SSL Certificate File to use for SSL mode.</td>
+                       <td>(StrOpt) Location of the SSL certificate file to use for SSL mode.</td>
               </tr>
               <tr>
                        <td>key_file = None</td>
-                       <td>(StrOpt) Location of the SSL Key File to use for enabling SSL mode.</td>
+                       <td>(StrOpt) Location of the SSL key file to use for enabling SSL mode.</td>
               </tr>
               <tr>
                        <td>max_header_line = 16384</td>
-                       <td>(IntOpt) Maximum line size of message headers to be accepted. max_header_line may need to be increased when using large tokens (typically those generated by the Keystone v3 API with big service catalogs</td>
+                       <td>(IntOpt) Maximum line size of message headers to be accepted. max_header_line may need to be increased when using large tokens (typically those generated by the Keystone v3 API with big service catalogs).</td>
               </tr>
               <tr>
                        <td>workers = 0</td>
diff --git a/doc/common/tables/heat-cfn_api.xml b/doc/common/tables/heat-cfn_api.xml
index 811dff2333..34ac0af8f7 100644
--- a/doc/common/tables/heat-cfn_api.xml
+++ b/doc/common/tables/heat-cfn_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_heat_cfn_api">
           <caption>Description of configuration options for cfn_api</caption>
            <col width="50%"/>
            <col width="50%"/>
@@ -35,7 +35,7 @@
               </tr>
               <tr>
                        <td>bind_host = 0.0.0.0</td>
-                       <td>(StrOpt) Address to bind the server.  Useful when selecting a particular network interface.</td>
+                       <td>(StrOpt) Address to bind the server. Useful when selecting a particular network interface.</td>
               </tr>
               <tr>
                        <td>bind_port = 8000</td>
@@ -43,15 +43,15 @@
               </tr>
               <tr>
                        <td>cert_file = None</td>
-                       <td>(StrOpt) Location of the SSL Certificate File to use for SSL mode.</td>
+                       <td>(StrOpt) Location of the SSL certificate file to use for SSL mode.</td>
               </tr>
               <tr>
                        <td>key_file = None</td>
-                       <td>(StrOpt) Location of the SSL Key File to use for enabling SSL mode.</td>
+                       <td>(StrOpt) Location of the SSL key file to use for enabling SSL mode.</td>
               </tr>
               <tr>
                        <td>max_header_line = 16384</td>
-                       <td>(IntOpt) Maximum line size of message headers to be accepted. max_header_line may need to be increased when using large tokens (typically those generated by the Keystone v3 API with big service catalogs</td>
+                       <td>(IntOpt) Maximum line size of message headers to be accepted. max_header_line may need to be increased when using large tokens (typically those generated by the Keystone v3 API with big service catalogs).</td>
               </tr>
               <tr>
                        <td>workers = 0</td>
diff --git a/doc/common/tables/heat-clients.xml b/doc/common/tables/heat-clients.xml
index 16d48d4ce8..3efd53da59 100644
--- a/doc/common/tables/heat-clients.xml
+++ b/doc/common/tables/heat-clients.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_heat_clients">
           <caption>Description of configuration options for clients</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-clients_backends.xml b/doc/common/tables/heat-clients_backends.xml
index 5baef3b1ce..d9992a34b3 100644
--- a/doc/common/tables/heat-clients_backends.xml
+++ b/doc/common/tables/heat-clients_backends.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_heat_clients_backends">
           <caption>Description of configuration options for clients_backends</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-clients_ceilometer.xml b/doc/common/tables/heat-clients_ceilometer.xml
index c656e041b9..6c1242f72c 100644
--- a/doc/common/tables/heat-clients_ceilometer.xml
+++ b/doc/common/tables/heat-clients_ceilometer.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_heat_clients_ceilometer">
           <caption>Description of configuration options for clients_ceilometer</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-clients_cinder.xml b/doc/common/tables/heat-clients_cinder.xml
index afcc1ebe41..0cea397303 100644
--- a/doc/common/tables/heat-clients_cinder.xml
+++ b/doc/common/tables/heat-clients_cinder.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_heat_clients_cinder">
           <caption>Description of configuration options for clients_cinder</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-clients_heat.xml b/doc/common/tables/heat-clients_heat.xml
index 9f0ef16ac8..ef347efe9c 100644
--- a/doc/common/tables/heat-clients_heat.xml
+++ b/doc/common/tables/heat-clients_heat.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_heat_clients_heat">
           <caption>Description of configuration options for clients_heat</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-clients_keystone.xml b/doc/common/tables/heat-clients_keystone.xml
index e91e47ba21..84d9d186d8 100644
--- a/doc/common/tables/heat-clients_keystone.xml
+++ b/doc/common/tables/heat-clients_keystone.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_heat_clients_keystone">
           <caption>Description of configuration options for clients_keystone</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-clients_neutron.xml b/doc/common/tables/heat-clients_neutron.xml
index 5a3120f639..fb4e49260a 100644
--- a/doc/common/tables/heat-clients_neutron.xml
+++ b/doc/common/tables/heat-clients_neutron.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_heat_clients_neutron">
           <caption>Description of configuration options for clients_neutron</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-clients_nova.xml b/doc/common/tables/heat-clients_nova.xml
index 92c480701d..cde1012c1d 100644
--- a/doc/common/tables/heat-clients_nova.xml
+++ b/doc/common/tables/heat-clients_nova.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_heat_clients_nova">
           <caption>Description of configuration options for clients_nova</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-clients_swift.xml b/doc/common/tables/heat-clients_swift.xml
index 3bb7d7d629..f597586310 100644
--- a/doc/common/tables/heat-clients_swift.xml
+++ b/doc/common/tables/heat-clients_swift.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_heat_clients_swift">
           <caption>Description of configuration options for clients_swift</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-clients_trove.xml b/doc/common/tables/heat-clients_trove.xml
index 017f11e09b..2008c11a17 100644
--- a/doc/common/tables/heat-clients_trove.xml
+++ b/doc/common/tables/heat-clients_trove.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_heat_clients_trove">
           <caption>Description of configuration options for clients_trove</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-cloudwatch_api.xml b/doc/common/tables/heat-cloudwatch_api.xml
index 7e501d90ab..9f6dfddc11 100644
--- a/doc/common/tables/heat-cloudwatch_api.xml
+++ b/doc/common/tables/heat-cloudwatch_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_heat_cloudwatch_api">
           <caption>Description of configuration options for cloudwatch_api</caption>
            <col width="50%"/>
            <col width="50%"/>
@@ -31,7 +31,7 @@
               </tr>
               <tr>
                        <td>bind_host = 0.0.0.0</td>
-                       <td>(StrOpt) Address to bind the server.  Useful when selecting a particular network interface.</td>
+                       <td>(StrOpt) Address to bind the server. Useful when selecting a particular network interface.</td>
               </tr>
               <tr>
                        <td>bind_port = 8003</td>
@@ -39,15 +39,15 @@
               </tr>
               <tr>
                        <td>cert_file = None</td>
-                       <td>(StrOpt) Location of the SSL Certificate File to use for SSL mode.</td>
+                       <td>(StrOpt) Location of the SSL certificate file to use for SSL mode.</td>
               </tr>
               <tr>
                        <td>key_file = None</td>
-                       <td>(StrOpt) Location of the SSL Key File to use for enabling SSL mode.</td>
+                       <td>(StrOpt) Location of the SSL key file to use for enabling SSL mode.</td>
               </tr>
               <tr>
                        <td>max_header_line = 16384</td>
-                       <td>(IntOpt) Maximum line size of message headers to be accepted. max_header_line may need to be increased when using large tokens (typically those generated by the Keystone v3 API with big service catalogs</td>
+                       <td>(IntOpt) Maximum line size of message headers to be accepted. max_header_line may need to be increased when using large tokens (typically those generated by the Keystone v3 API with big service catalogs.)</td>
               </tr>
               <tr>
                        <td>workers = 0</td>
diff --git a/doc/common/tables/heat-common.xml b/doc/common/tables/heat-common.xml
index 3a72419dc5..00f7dec9c2 100644
--- a/doc/common/tables/heat-common.xml
+++ b/doc/common/tables/heat-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_heat_common">
           <caption>Description of configuration options for common</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-crypt.xml b/doc/common/tables/heat-crypt.xml
index 1a54371263..dcdd87c22e 100644
--- a/doc/common/tables/heat-crypt.xml
+++ b/doc/common/tables/heat-crypt.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_heat_crypt">
           <caption>Description of configuration options for crypt</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-database.xml b/doc/common/tables/heat-database.xml
index 51f146c9d5..a5b47c434b 100644
--- a/doc/common/tables/heat-database.xml
+++ b/doc/common/tables/heat-database.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_heat_database">
           <caption>Description of configuration options for database</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-debug.xml b/doc/common/tables/heat-debug.xml
index 2e5fe24ad4..f92ff231dc 100644
--- a/doc/common/tables/heat-debug.xml
+++ b/doc/common/tables/heat-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_heat_debug">
           <caption>Description of configuration options for debug</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-loadbalancer.xml b/doc/common/tables/heat-loadbalancer.xml
index 39715a2de3..9de02b0094 100644
--- a/doc/common/tables/heat-loadbalancer.xml
+++ b/doc/common/tables/heat-loadbalancer.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_heat_loadbalancer">
           <caption>Description of configuration options for loadbalancer</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-logging.xml b/doc/common/tables/heat-logging.xml
index e024b099b5..5f3e25e16a 100644
--- a/doc/common/tables/heat-logging.xml
+++ b/doc/common/tables/heat-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_heat_logging">
           <caption>Description of configuration options for logging</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-metadata_api.xml b/doc/common/tables/heat-metadata_api.xml
index 69e16fb0d3..9bf75c0d0f 100644
--- a/doc/common/tables/heat-metadata_api.xml
+++ b/doc/common/tables/heat-metadata_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_heat_metadata_api">
           <caption>Description of configuration options for metadata_api</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-notification.xml b/doc/common/tables/heat-notification.xml
index af46113910..22af226944 100644
--- a/doc/common/tables/heat-notification.xml
+++ b/doc/common/tables/heat-notification.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_heat_notification">
           <caption>Description of configuration options for notification</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-qpid.xml b/doc/common/tables/heat-qpid.xml
index d0ec72f3a8..2a3ac5d27a 100644
--- a/doc/common/tables/heat-qpid.xml
+++ b/doc/common/tables/heat-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_heat_qpid">
           <caption>Description of configuration options for qpid</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-quota.xml b/doc/common/tables/heat-quota.xml
index 58cc2b3653..dc797146b8 100644
--- a/doc/common/tables/heat-quota.xml
+++ b/doc/common/tables/heat-quota.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_heat_quota">
           <caption>Description of configuration options for quota</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-rabbitmq.xml b/doc/common/tables/heat-rabbitmq.xml
index a7bcc9bafa..dc66fef627 100644
--- a/doc/common/tables/heat-rabbitmq.xml
+++ b/doc/common/tables/heat-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_heat_rabbitmq">
           <caption>Description of configuration options for rabbitmq</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-redis.xml b/doc/common/tables/heat-redis.xml
index f885f3e2f5..da664aacef 100644
--- a/doc/common/tables/heat-redis.xml
+++ b/doc/common/tables/heat-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_heat_redis">
           <caption>Description of configuration options for redis</caption>
            <col width="50%"/>
            <col width="50%"/>
@@ -37,17 +37,6 @@
                        <td>port = 6379</td>
                        <td>(IntOpt) Use this port to connect to redis host.</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/heat-rpc.xml b/doc/common/tables/heat-rpc.xml
index 00fa531fb9..a2e53ef561 100644
--- a/doc/common/tables/heat-rpc.xml
+++ b/doc/common/tables/heat-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_heat_rpc">
           <caption>Description of configuration options for rpc</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-waitcondition_api.xml b/doc/common/tables/heat-waitcondition_api.xml
index 277ecd4e74..d8aced5fa9 100644
--- a/doc/common/tables/heat-waitcondition_api.xml
+++ b/doc/common/tables/heat-waitcondition_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_heat_waitcondition_api">
           <caption>Description of configuration options for waitcondition_api</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/doc/common/tables/heat-zeromq.xml b/doc/common/tables/heat-zeromq.xml
index aad1943585..1bf53ae2bc 100644
--- a/doc/common/tables/heat-zeromq.xml
+++ b/doc/common/tables/heat-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_heat_zeromq">
           <caption>Description of configuration options for zeromq</caption>
            <col width="50%"/>
            <col width="50%"/>
diff --git a/tools/autogenerate-config-flagmappings/heat.flagmappings b/tools/autogenerate-config-flagmappings/heat.flagmappings
index 2f8d811da5..fe41d8679c 100644
--- a/tools/autogenerate-config-flagmappings/heat.flagmappings
+++ b/tools/autogenerate-config-flagmappings/heat.flagmappings
@@ -201,6 +201,3 @@ rpc_notifier2/topics rpc
 ssl/ca_file api cfn_api cloudwatch_api
 ssl/cert_file api cfn_api cloudwatch_api
 ssl/key_file api cfn_api cloudwatch_api
-port redis
-password redis
-transport_url amqp