From: Lucas Di Pentima <lucas.dipentima@curii.com>
Date: Fri, 5 May 2023 17:43:51 +0000 (-0300)
Subject: Merge branch '20468-installer-perf-knobs'. Closes #20468
X-Git-Tag: 2.7.0~115
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/64639ed6313f01016da4e0ffd81752dedf9b052b?hp=-c

Merge branch '20468-installer-perf-knobs'. Closes #20468

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima@curii.com>
---

64639ed6313f01016da4e0ffd81752dedf9b052b
diff --combined tools/salt-install/config_examples/multi_host/aws/pillars/arvados.sls
index b0247b2a40,9ba5af9bc6..03859c46bd
--- a/tools/salt-install/config_examples/multi_host/aws/pillars/arvados.sls
+++ b/tools/salt-install/config_examples/multi_host/aws/pillars/arvados.sls
@@@ -107,6 -107,12 +107,12 @@@ arvados
              Email: __INITIAL_USER_EMAIL__
              Password: __INITIAL_USER_PASSWORD__
  
+     ### API
+     {%- if "__CONTROLLER_MAX_CONCURRENT_REQUESTS__" != "" %}
+     API:
+       MaxConcurrentRequests: __CONTROLLER_MAX_CONCURRENT_REQUESTS__
+     {%- endif %}
+ 
      ### CONTAINERS
      Containers:
        MaxRetryAttempts: 10
@@@ -174,7 -180,7 +180,7 @@@
        WebDAV:
          ExternalURL: 'https://*.collections.__CLUSTER__.__DOMAIN__:__KEEPWEB_EXT_SSL_PORT__/'
          InternalURLs:
 -          'http://localhost:9002': {}
 +          'http://__KEEPWEB_INT_IP__:9002': {}
        WebDAVDownload:
          ExternalURL: 'https://download.__CLUSTER__.__DOMAIN__:__KEEPWEB_EXT_SSL_PORT__'
        WebShell: