commit 17b957b53edd09fca3c5730395cc3454db5b724c
author Vladislav Naumov <vnaumov@mirantis.com> Fri Sep 22 15:37:48 2017 +0300
committer Vladislav Naumov <vnaumov@mirantis.com> Mon Sep 25 13:50:09 2017 +0300
tree f602b11cef80d17ff4446ad4e6dbb163dbb41978
parent 069fd28463a621f84cd0fb94003b54fb0425a976

possibility of defining nginx timeouts

related bug: https://mirantis.jira.com/browse/PROD-14603

Change-Id: I37b99ecec0c9a8ae1c13c02b97ff6e6cbf1d1472

devops_portal/files/nginx.conf

diff --git a/devops_portal/files/nginx.conf b/devops_portal/files/nginx.conf
index 25b6fcc..20b6778 100644
--- a/devops_portal/files/nginx.conf
+++ b/devops_portal/files/nginx.conf
@@ -54,11 +54,19 @@
             resolver 127.0.0.11;
             set ${{ service.endpoint.address|replace("-", "_") }} {{ service.endpoint.address }};
             rewrite ^/api/{{ service_name }}/(.*) /$1 break;
-            proxy_pass {{ service_url_dns(service.endpoint) }};
+            proxy_connect_timeout       {{ service.proxy_connect_timeout|default(300) }};
+            proxy_send_timeout          {{ service.proxy_send_timeout|default(300) }};
+            proxy_read_timeout          {{ service.proxy_read_timeout|default(300) }};
+            send_timeout                {{ service.send_timeout|default(300) }};
+            proxy_pass                  {{ service_url_dns(service.endpoint) }};
         }
 {%- else %}
         location /api/{{ service_name }}/ {
-            proxy_pass {{ service_url(service.endpoint) }};
+            proxy_connect_timeout       {{ service.proxy_connect_timeout|default(300) }};
+            proxy_send_timeout          {{ service.proxy_send_timeout|default(300) }};
+            proxy_read_timeout          {{ service.proxy_read_timeout|default(300) }};
+            send_timeout                {{ service.send_timeout|default(300) }};
+            proxy_pass                  {{ service_url(service.endpoint) }};
         }
 {%- endif %}
 {%- endif %}