Apache: increase the base timeout

This change increases the base timeout value in Apache, from current
60 seconds to 90 seconds, because sometimes response can take more than
60 seconds when rpc_response_timeout (60s by default) is exceeded,
and the actual response from service should be more informative than
504 response by apache.

Closes-Bug: #1931656
Change-Id: I0200a01d8fc2a4476436a00f2cabfb74e4540123

deployment/apache/apache-baremetal-puppet.j2.yaml

@@ -54,6 +54,11 @@ parameters:
     default: ''
     description: Override the private key size used when creating the
                  certificate for this service
+  ApacheTimeout:
+    type: number
+    default: 90
+    description: The timeout in seconds for Apache, which defines duration
+                 Apache waits for I/O operations
 
 conditions:
   key_size_override_set:
@@ -93,6 +98,7 @@ outputs:
             apache::trace_enable: 'Off'
             apache::server_signature: 'Off'
             apache::server_tokens: 'Prod'
+            apache::timeout: {get_param: ApacheTimeout}
             apache::mod::prefork::maxrequestworkers: { get_param: ApacheMaxRequestWorkers }
             apache::mod::prefork::serverlimit: { get_param: ApacheServerLimit }
             apache::mod::remoteip::proxy_ips:

releasenotes/notes/apache-timeout-d61a3910ce7dc162.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The new ``ApacheTimeout`` parameter has been added, which determines
+    the timeout used for IO operations in Apache.