From 31b4547b05ae38846a9874115d3e803944512c6c Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Thu, 4 Jul 2019 11:34:41 +0800
Subject: [PATCH] Manage oslo_middleware/max_request_body_size

So that we can increase it from the default 114688

Useful in case for example the OS-Federation mapping is too large.

If this limit is breached aodh will return a 413 Entity Too Large
and not log anything to aodh.log.

Change-Id: I3ce3523f00a88dece33657a583d661eea58e90a4
Closes-Bug: #1835161
---
 manifests/api.pp                                      |  6 ++++++
 .../notes/max_request_body_size-a9e6d2796a735b27.yaml |  5 +++++
 spec/classes/aodh_api_spec.rb                         | 11 +++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 releasenotes/notes/max_request_body_size-a9e6d2796a735b27.yaml

diff --git a/manifests/api.pp b/manifests/api.pp
index 4b8b150e..f2a1ed14 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -36,6 +36,10 @@
 #   HTTPProxyToWSGI middleware.
 #   Defaults to $::os_service_default.
 #
+# [*max_request_body_size*]
+#   (Optional) Set max request body size
+#   Defaults to $::os_service_default.
+#
 # [*paste_config*]
 #   (Optional) Configuration file for WSGI definition of API
 #   Defaults to $::os_service_default.
@@ -62,6 +66,7 @@ class aodh::api (
   $sync_db                        = false,
   $auth_strategy                  = 'keystone',
   $enable_proxy_headers_parsing   = $::os_service_default,
+  $max_request_body_size          = $::os_service_default,
   $paste_config                   = $::os_service_default,
   $gnocchi_external_project_owner = 'services',
   # DEPRECATED PARAMETERS
@@ -138,5 +143,6 @@ as a standalone service, or httpd for being run by a httpd server")
 
   oslo::middleware { 'aodh_config':
     enable_proxy_headers_parsing => $enable_proxy_headers_parsing,
+    max_request_body_size        => $max_request_body_size,
   }
 }
diff --git a/releasenotes/notes/max_request_body_size-a9e6d2796a735b27.yaml b/releasenotes/notes/max_request_body_size-a9e6d2796a735b27.yaml
new file mode 100644
index 00000000..f29fec52
--- /dev/null
+++ b/releasenotes/notes/max_request_body_size-a9e6d2796a735b27.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Add support to configure `[oslo_middleware]/max_request_body_size` with
+    `$max_request_body_size`.
diff --git a/spec/classes/aodh_api_spec.rb b/spec/classes/aodh_api_spec.rb
index 1e3783e0..383be0e8 100644
--- a/spec/classes/aodh_api_spec.rb
+++ b/spec/classes/aodh_api_spec.rb
@@ -36,6 +36,7 @@ describe 'aodh::api' do
       is_expected.to contain_aodh_config('api/paste_config').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_oslo__middleware('aodh_config').with(
         :enable_proxy_headers_parsing => '<SERVICE DEFAULT>',
+        :max_request_body_size        => '<SERVICE DEFAULT>',
       )
     end
 
@@ -78,6 +79,16 @@ describe 'aodh::api' do
       )}
     end
 
+    context 'with max_request_body_size' do
+      before do
+        params.merge!({:max_request_body_size => '102400' })
+      end
+
+      it { is_expected.to contain_oslo__middleware('aodh_config').with(
+        :max_request_body_size => '102400',
+      )}
+    end
+
     context 'with paste_config' do
       before do
         params.merge!({:paste_config => '/etc/aodh/api-paste.ini' })