From 57fb7fd0a58cb17bc3af31db9935f5abe365eefd Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Tue, 18 Jan 2022 22:04:31 +0100
Subject: [PATCH] Remove custom value for max_allowed_request_size_in_bytes

There is no explanation for why this option was bumped to 1 MB instead
of the upstream default. This has been the case since the original
barbican role commit in 2016.

Restore upstream default in Yoga.

Change-Id: Ib0245f44d2b049f7e2254d8d2ea4b2080a8d62dd
---
 ansible/roles/barbican/templates/barbican.conf.j2           | 1 -
 .../barbican-max-allowed-request-size-e01ce6526546be56.yaml | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/barbican-max-allowed-request-size-e01ce6526546be56.yaml

diff --git a/ansible/roles/barbican/templates/barbican.conf.j2 b/ansible/roles/barbican/templates/barbican.conf.j2
index e1faf71a6d..00c9ecf413 100644
--- a/ansible/roles/barbican/templates/barbican.conf.j2
+++ b/ansible/roles/barbican/templates/barbican.conf.j2
@@ -10,7 +10,6 @@ bind_host = {{ api_interface_address }}
 host_href = {{ barbican_public_endpoint }}
 
 backlog = 4096
-max_allowed_request_size_in_bytes = 1000000
 
 db_auto_create = False
 sql_connection = mysql+pymysql://{{ barbican_database_user }}:{{ barbican_database_password }}@{{ barbican_database_address }}/{{ barbican_database_name }}
diff --git a/releasenotes/notes/barbican-max-allowed-request-size-e01ce6526546be56.yaml b/releasenotes/notes/barbican-max-allowed-request-size-e01ce6526546be56.yaml
new file mode 100644
index 0000000000..43d3108380
--- /dev/null
+++ b/releasenotes/notes/barbican-max-allowed-request-size-e01ce6526546be56.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Restores upstream default value for ``max_allowed_request_size_in_bytes``
+    in ``barbican.conf``. It was set to 1000000 bytes instead of the upstream
+    default of 25000 bytes.