From b46b6dd5a31af062fabfaff4b8dd595d56348f5e Mon Sep 17 00:00:00 2001
From: Gauvain Pocentek <gauvain.pocentek@objectif-libre.com>
Date: Thu, 7 May 2015 06:46:09 +0200
Subject: [PATCH] config-ref: include oslo.middleware options

Change-Id: Idd61531c8a9196172020c315ac665fa641cb3428
Closes-Bug: #1452454
---
 .../tables/ceilometer-oslo_middleware.xml     | 26 +++++++++++++++++++
 doc/common/tables/cinder-oslo_middleware.xml  | 26 +++++++++++++++++++
 doc/common/tables/heat-oslo_middleware.xml    | 26 +++++++++++++++++++
 .../tables/keystone-oslo_middleware.xml       | 26 +++++++++++++++++++
 doc/common/tables/neutron-oslo_middleware.xml | 26 +++++++++++++++++++
 doc/common/tables/nova-oslo_middleware.xml    | 26 +++++++++++++++++++
 doc/common/tables/sahara-oslo_middleware.xml  | 26 +++++++++++++++++++
 .../block-storage/section_misc.xml            |  1 +
 .../ch_dataprocessingserviceconfigure.xml     |  1 +
 doc/config-reference/ch_identityconfigure.xml |  1 +
 .../ch_orchestrationconfigure.xml             |  1 +
 .../ch_telemetryconfigure.xml                 |  1 +
 .../section_compute-options-reference.xml     |  1 +
 .../section_networking-options-reference.xml  |  7 +++++
 .../ceilometer.flagmappings                   |  1 +
 .../cinder.flagmappings                       |  1 +
 .../heat.flagmappings                         |  1 +
 .../keystone.flagmappings                     |  1 +
 .../neutron.flagmappings                      |  1 +
 .../nova.flagmappings                         |  1 +
 .../sahara.flagmappings                       |  1 +
 21 files changed, 202 insertions(+)
 create mode 100644 doc/common/tables/ceilometer-oslo_middleware.xml
 create mode 100644 doc/common/tables/cinder-oslo_middleware.xml
 create mode 100644 doc/common/tables/heat-oslo_middleware.xml
 create mode 100644 doc/common/tables/keystone-oslo_middleware.xml
 create mode 100644 doc/common/tables/neutron-oslo_middleware.xml
 create mode 100644 doc/common/tables/nova-oslo_middleware.xml
 create mode 100644 doc/common/tables/sahara-oslo_middleware.xml

diff --git a/doc/common/tables/ceilometer-oslo_middleware.xml b/doc/common/tables/ceilometer-oslo_middleware.xml
new file mode 100644
index 0000000000..240bbe13f7
--- /dev/null
+++ b/doc/common/tables/ceilometer-oslo_middleware.xml
@@ -0,0 +1,26 @@
+<?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_ceilometer_oslo_middleware">
+    <caption>Description of oslo_middleware 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">[oslo_middleware]</th>
+      </tr>
+      <tr>
+        <td><option>max_request_body_size</option> = <replaceable>114688</replaceable></td>
+        <td>(IntOpt) The maximum body size for each  request, in bytes.</td>
+      </tr>
+    </tbody>
+  </table>
+</para>
diff --git a/doc/common/tables/cinder-oslo_middleware.xml b/doc/common/tables/cinder-oslo_middleware.xml
new file mode 100644
index 0000000000..466dd0f808
--- /dev/null
+++ b/doc/common/tables/cinder-oslo_middleware.xml
@@ -0,0 +1,26 @@
+<?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_cinder_oslo_middleware">
+    <caption>Description of oslo_middleware 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">[oslo_middleware]</th>
+      </tr>
+      <tr>
+        <td><option>max_request_body_size</option> = <replaceable>114688</replaceable></td>
+        <td>(IntOpt) The maximum body size for each  request, in bytes.</td>
+      </tr>
+    </tbody>
+  </table>
+</para>
diff --git a/doc/common/tables/heat-oslo_middleware.xml b/doc/common/tables/heat-oslo_middleware.xml
new file mode 100644
index 0000000000..a96412b6f0
--- /dev/null
+++ b/doc/common/tables/heat-oslo_middleware.xml
@@ -0,0 +1,26 @@
+<?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_heat_oslo_middleware">
+    <caption>Description of oslo_middleware 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">[oslo_middleware]</th>
+      </tr>
+      <tr>
+        <td><option>max_request_body_size</option> = <replaceable>114688</replaceable></td>
+        <td>(IntOpt) The maximum body size for each  request, in bytes.</td>
+      </tr>
+    </tbody>
+  </table>
+</para>
diff --git a/doc/common/tables/keystone-oslo_middleware.xml b/doc/common/tables/keystone-oslo_middleware.xml
new file mode 100644
index 0000000000..0fd35fb7c3
--- /dev/null
+++ b/doc/common/tables/keystone-oslo_middleware.xml
@@ -0,0 +1,26 @@
+<?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_keystone_oslo_middleware">
+    <caption>Description of oslo_middleware 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">[oslo_middleware]</th>
+      </tr>
+      <tr>
+        <td><option>max_request_body_size</option> = <replaceable>114688</replaceable></td>
+        <td>(IntOpt) The maximum body size for each  request, in bytes.</td>
+      </tr>
+    </tbody>
+  </table>
+</para>
diff --git a/doc/common/tables/neutron-oslo_middleware.xml b/doc/common/tables/neutron-oslo_middleware.xml
new file mode 100644
index 0000000000..866f9cccd1
--- /dev/null
+++ b/doc/common/tables/neutron-oslo_middleware.xml
@@ -0,0 +1,26 @@
+<?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_oslo_middleware">
+    <caption>Description of oslo_middleware 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">[oslo_middleware]</th>
+      </tr>
+      <tr>
+        <td><option>max_request_body_size</option> = <replaceable>114688</replaceable></td>
+        <td>(IntOpt) The maximum body size for each  request, in bytes.</td>
+      </tr>
+    </tbody>
+  </table>
+</para>
diff --git a/doc/common/tables/nova-oslo_middleware.xml b/doc/common/tables/nova-oslo_middleware.xml
new file mode 100644
index 0000000000..c4d0c6c566
--- /dev/null
+++ b/doc/common/tables/nova-oslo_middleware.xml
@@ -0,0 +1,26 @@
+<?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_nova_oslo_middleware">
+    <caption>Description of oslo_middleware 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">[oslo_middleware]</th>
+      </tr>
+      <tr>
+        <td><option>max_request_body_size</option> = <replaceable>114688</replaceable></td>
+        <td>(IntOpt) The maximum body size for each  request, in bytes.</td>
+      </tr>
+    </tbody>
+  </table>
+</para>
diff --git a/doc/common/tables/sahara-oslo_middleware.xml b/doc/common/tables/sahara-oslo_middleware.xml
new file mode 100644
index 0000000000..8c78abe557
--- /dev/null
+++ b/doc/common/tables/sahara-oslo_middleware.xml
@@ -0,0 +1,26 @@
+<?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_sahara_oslo_middleware">
+    <caption>Description of oslo_middleware 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">[oslo_middleware]</th>
+      </tr>
+      <tr>
+        <td><option>max_request_body_size</option> = <replaceable>114688</replaceable></td>
+        <td>(IntOpt) The maximum body size for each  request, in bytes.</td>
+      </tr>
+    </tbody>
+  </table>
+</para>
diff --git a/doc/config-reference/block-storage/section_misc.xml b/doc/config-reference/block-storage/section_misc.xml
index 096b0ef6f0..52b9bbed94 100644
--- a/doc/config-reference/block-storage/section_misc.xml
+++ b/doc/config-reference/block-storage/section_misc.xml
@@ -34,6 +34,7 @@
     <xi:include href="../../common/tables/cinder-logging.xml"/>
     <xi:include href="../../common/tables/cinder-nas.xml"/>
     <xi:include href="../../common/tables/cinder-openvstorage.xml"/>
+    <xi:include href="../../common/tables/cinder-oslo_middleware.xml"/>
     <xi:include href="../../common/tables/cinder-profiler.xml"/>
     <xi:include href="../../common/tables/cinder-pure.xml"/>
     <xi:include href="../../common/tables/cinder-qpid.xml"/>
diff --git a/doc/config-reference/ch_dataprocessingserviceconfigure.xml b/doc/config-reference/ch_dataprocessingserviceconfigure.xml
index d2e5c538d9..9a5ca71672 100644
--- a/doc/config-reference/ch_dataprocessingserviceconfigure.xml
+++ b/doc/config-reference/ch_dataprocessingserviceconfigure.xml
@@ -21,6 +21,7 @@
       <xi:include href="../common/tables/sahara-database.xml"/>
       <xi:include href="../common/tables/sahara-domain.xml"/>
       <xi:include href="../common/tables/sahara-logging.xml"/>
+      <xi:include href="../common/tables/sahara-oslo_middleware.xml"/>
       <xi:include href="../common/tables/sahara-policy.xml"/>
       <xi:include href="../common/tables/sahara-qpid.xml"/>
       <xi:include href="../common/tables/sahara-rabbitmq.xml"/>
diff --git a/doc/config-reference/ch_identityconfigure.xml b/doc/config-reference/ch_identityconfigure.xml
index 1a80751999..513dbe2f16 100644
--- a/doc/config-reference/ch_identityconfigure.xml
+++ b/doc/config-reference/ch_identityconfigure.xml
@@ -75,6 +75,7 @@ options. For installation prerequisites and step-by-step walkthroughs, see the
     <xi:include href="../common/tables/keystone-memcache.xml"/>
     <xi:include href="../common/tables/keystone-oauth.xml"/>
     <xi:include href="../common/tables/keystone-os_inherit.xml"/>
+    <xi:include href="../common/tables/keystone-oslo_middleware.xml"/>
     <xi:include href="../common/tables/keystone-policy.xml"/>
     <xi:include href="../common/tables/keystone-revoke.xml"/>
     <xi:include href="../common/tables/keystone-role.xml"/>
diff --git a/doc/config-reference/ch_orchestrationconfigure.xml b/doc/config-reference/ch_orchestrationconfigure.xml
index 99e085c0d6..afa7798274 100644
--- a/doc/config-reference/ch_orchestrationconfigure.xml
+++ b/doc/config-reference/ch_orchestrationconfigure.xml
@@ -23,6 +23,7 @@
     <xi:include href="../common/tables/heat-debug.xml"/>
     <xi:include href="../common/tables/heat-loadbalancer.xml"/>
     <xi:include href="../common/tables/heat-logging.xml"/>
+    <xi:include href="../common/tables/heat-oslo_middleware.xml"/>
     <xi:include href="../common/tables/heat-quota.xml"/>
     <xi:include href="../common/tables/heat-redis.xml"/>
     <xi:include href="../common/tables/heat-testing.xml"/>
diff --git a/doc/config-reference/ch_telemetryconfigure.xml b/doc/config-reference/ch_telemetryconfigure.xml
index 64b6ea60c8..723655f0db 100644
--- a/doc/config-reference/ch_telemetryconfigure.xml
+++ b/doc/config-reference/ch_telemetryconfigure.xml
@@ -31,6 +31,7 @@
     <xi:include href="../common/tables/ceilometer-glance.xml"/>
     <xi:include href="../common/tables/ceilometer-inspector.xml"/>
     <xi:include href="../common/tables/ceilometer-ipmi.xml"/>
+    <xi:include href="../common/tables/ceilometer-oslo_middleware.xml"/>
     <xi:include href="../common/tables/ceilometer-logging.xml"/>
     <xi:include href="../common/tables/ceilometer-magnetodb.xml"/>
     <xi:include href="../common/tables/ceilometer-notification.xml"/>
diff --git a/doc/config-reference/compute/section_compute-options-reference.xml b/doc/config-reference/compute/section_compute-options-reference.xml
index 57d31e37b5..9e7de8b9f0 100644
--- a/doc/config-reference/compute/section_compute-options-reference.xml
+++ b/doc/config-reference/compute/section_compute-options-reference.xml
@@ -39,6 +39,7 @@
     <xi:include href="../../common/tables/nova-metadata.xml"/>
     <xi:include href="../../common/tables/nova-network.xml"/>
     <xi:include href="../../common/tables/nova-neutron.xml"/>
+    <xi:include href="../../common/tables/nova-oslo_middleware.xml"/>
     <xi:include href="../../common/tables/nova-pci.xml"/>
     <xi:include href="../../common/tables/nova-periodic.xml"/>
     <xi:include href="../../common/tables/nova-policy.xml"/>
diff --git a/doc/config-reference/networking/section_networking-options-reference.xml b/doc/config-reference/networking/section_networking-options-reference.xml
index 4c22dcade3..6ef1aec9da 100644
--- a/doc/config-reference/networking/section_networking-options-reference.xml
+++ b/doc/config-reference/networking/section_networking-options-reference.xml
@@ -124,6 +124,13 @@
     <xi:include href="../../common/tables/neutron-nova.xml"/>
 </section>
 
+<section xml:id="networking-options-oslo-middleware">
+<title>Policy</title>
+<para>Use the following options in the
+<filename>neutron.conf</filename> file to change oslo middleware settings.</para>
+    <xi:include href="../../common/tables/neutron-oslo_middleware.xml"/>
+</section>
+
 <section xml:id="networking-options-policy">
 <title>Policy</title>
 <para>Use the following options in the
diff --git a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings
index 921ee8f41d..428e6ffb6b 100644
--- a/tools/autogenerate-config-flagmappings/ceilometer.flagmappings
+++ b/tools/autogenerate-config-flagmappings/ceilometer.flagmappings
@@ -236,6 +236,7 @@ oslo_messaging_rabbit/rabbit_use_ssl rabbitmq
 oslo_messaging_rabbit/rabbit_userid rabbitmq
 oslo_messaging_rabbit/rabbit_virtual_host rabbitmq
 oslo_messaging_rabbit/rpc_conn_pool_size rabbitmq
+oslo_middleware/max_request_body_size oslo_middleware
 oslo_policy/policy_default_rule policy
 oslo_policy/policy_dirs policy
 oslo_policy/policy_file policy
diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings
index 1ba1f21bb7..c189a3ba74 100644
--- a/tools/autogenerate-config-flagmappings/cinder.flagmappings
+++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings
@@ -615,5 +615,6 @@ oslo_messaging_rabbit/rabbit_use_ssl rabbitmq
 oslo_messaging_rabbit/rabbit_userid rabbitmq
 oslo_messaging_rabbit/rabbit_virtual_host rabbitmq
 oslo_messaging_rabbit/rpc_conn_pool_size rabbitmq
+oslo_middleware/max_request_body_size oslo_middleware
 profiler/profiler_enabled profiler
 profiler/trace_sqlalchemy profiler
diff --git a/tools/autogenerate-config-flagmappings/heat.flagmappings b/tools/autogenerate-config-flagmappings/heat.flagmappings
index 2a1c5f3afe..a86b7b946c 100644
--- a/tools/autogenerate-config-flagmappings/heat.flagmappings
+++ b/tools/autogenerate-config-flagmappings/heat.flagmappings
@@ -284,6 +284,7 @@ oslo_messaging_rabbit/rabbit_use_ssl rabbitmq
 oslo_messaging_rabbit/rabbit_userid rabbitmq
 oslo_messaging_rabbit/rabbit_virtual_host rabbitmq
 oslo_messaging_rabbit/rpc_conn_pool_size rabbitmq
+oslo_middleware/max_request_body_size oslo_middleware
 paste_deploy/api_paste_config api
 paste_deploy/flavor api
 profiler/profiler_enabled testing
diff --git a/tools/autogenerate-config-flagmappings/keystone.flagmappings b/tools/autogenerate-config-flagmappings/keystone.flagmappings
index 6d259c3b97..a9e8c5530c 100644
--- a/tools/autogenerate-config-flagmappings/keystone.flagmappings
+++ b/tools/autogenerate-config-flagmappings/keystone.flagmappings
@@ -312,6 +312,7 @@ oslo_messaging_rabbit/rabbit_use_ssl rabbitmq
 oslo_messaging_rabbit/rabbit_userid rabbitmq
 oslo_messaging_rabbit/rabbit_virtual_host rabbitmq
 oslo_messaging_rabbit/rpc_conn_pool_size rabbitmq
+oslo_middleware/max_request_body_size oslo_middleware
 oslo_policy/policy_default_rule policy
 oslo_policy/policy_dirs policy
 oslo_policy/policy_file policy
diff --git a/tools/autogenerate-config-flagmappings/neutron.flagmappings b/tools/autogenerate-config-flagmappings/neutron.flagmappings
index 0a08ee2047..5d81c0b48b 100644
--- a/tools/autogenerate-config-flagmappings/neutron.flagmappings
+++ b/tools/autogenerate-config-flagmappings/neutron.flagmappings
@@ -717,6 +717,7 @@ oslo_messaging_rabbit/rabbit_use_ssl rabbitmq
 oslo_messaging_rabbit/rabbit_userid rabbitmq
 oslo_messaging_rabbit/rabbit_virtual_host rabbitmq
 oslo_messaging_rabbit/rpc_conn_pool_size rabbitmq
+oslo_middleware/max_request_body_size oslo_middleware
 ovsdb/l2_gw_agent_ca_cert_base_path l2gw
 ovsdb/l2_gw_agent_cert_base_path l2gw
 ovsdb/l2_gw_agent_priv_key_base_path l2gw
diff --git a/tools/autogenerate-config-flagmappings/nova.flagmappings b/tools/autogenerate-config-flagmappings/nova.flagmappings
index 335af25bfb..dcc2fd4bfd 100644
--- a/tools/autogenerate-config-flagmappings/nova.flagmappings
+++ b/tools/autogenerate-config-flagmappings/nova.flagmappings
@@ -677,6 +677,7 @@ oslo_messaging_rabbit/rabbit_use_ssl rabbitmq
 oslo_messaging_rabbit/rabbit_userid rabbitmq
 oslo_messaging_rabbit/rabbit_virtual_host rabbitmq
 oslo_messaging_rabbit/rpc_conn_pool_size rabbitmq
+oslo_middleware/max_request_body_size oslo_middleware
 rdp/enabled rdp
 rdp/html5_proxy_base_url rdp
 serial_console/base_url serial_console
diff --git a/tools/autogenerate-config-flagmappings/sahara.flagmappings b/tools/autogenerate-config-flagmappings/sahara.flagmappings
index eda9fd5d44..f332f2a3a0 100644
--- a/tools/autogenerate-config-flagmappings/sahara.flagmappings
+++ b/tools/autogenerate-config-flagmappings/sahara.flagmappings
@@ -205,6 +205,7 @@ oslo_messaging_rabbit/rabbit_use_ssl rabbitmq
 oslo_messaging_rabbit/rabbit_userid rabbitmq
 oslo_messaging_rabbit/rabbit_virtual_host rabbitmq
 oslo_messaging_rabbit/rpc_conn_pool_size rabbitmq
+oslo_middleware/max_request_body_size oslo_middleware
 oslo_policy/policy_default_rule policy
 oslo_policy/policy_dirs policy
 oslo_policy/policy_file policy