commit 9e099ba7dd7e0759c8320a27fc2d24821bc412f9
author Ales Komarek <akomarek@mirantis.com> Mon Jul 10 14:36:25 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Mon Jul 10 14:36:28 2017 +0000
tree 9543ee17878f092671bbce68be9f7893a98d7f87
parent aa04fc13548bc8c1696bb729d30f5309ab6c2565
parent e116c97c889720e60e1f2469d960daccbe859f02

Merge "Fix postgresql haproxy timeouts"

docker/swarm/stack/postgresql.yml

diff --git a/docker/swarm/stack/postgresql.yml b/docker/swarm/stack/postgresql.yml
index 7ae4052..73435fb 100644
--- a/docker/swarm/stack/postgresql.yml
+++ b/docker/swarm/stack/postgresql.yml
@@ -11,6 +11,7 @@
           environment:
             POSTGRES_USER: ${_param:postgresql_admin_user}
             POSTGRES_PASSWORD: ${_param:postgresql_admin_user_password}
+            SQLALCHEMY_POOL_RECYCLE: 14400
           service:
             db:
               image: ${_param:docker_image_postgresql}

haproxy/proxy/listen/oss/postgresql.yml

diff --git a/haproxy/proxy/listen/oss/postgresql.yml b/haproxy/proxy/listen/oss/postgresql.yml
index 1bc1f44..a356a48 100644
--- a/haproxy/proxy/listen/oss/postgresql.yml
+++ b/haproxy/proxy/listen/oss/postgresql.yml
@@ -7,6 +7,11 @@
       enabled: false
   haproxy:
     proxy:
+      timeout:
+        queue: '8h'
+        client: '8h'
+        server: '8h'
+        check: '10s'
       listen:
         postgresql:
           mode: tcp