From b80033c24dcce340faa759009a26614577791ad6 Mon Sep 17 00:00:00 2001
From: Patrick Valsecchi <patrick.valsecchi@camptocamp.com>
Date: Wed, 8 Aug 2018 09:40:27 +0200
Subject: [PATCH] Upgrade tilecloud-chain to 1.7.1

And switch to use Redis by default instead of SQS between the tilecloud-chain
master and slaves.
---
 docker/build/requirements.txt                                 | 2 +-
 .../scaffolds/create/docker-compose.yaml.mako                 | 4 ++--
 .../create/tilegeneration/config.yaml.tmpl.mako_tmpl          | 4 ++++
 .../scaffolds/update/CONST_vars.yaml_tmpl                     | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/docker/build/requirements.txt b/docker/build/requirements.txt
index b8943a2c5a..c1abc31c65 100644
--- a/docker/build/requirements.txt
+++ b/docker/build/requirements.txt
@@ -65,7 +65,7 @@ Sphinx==1.7.2  # doc
 sphinx-prompt==1.0.0  # doc
 SQLAlchemy==1.2.6
 tilecloud==1.0.0  # Tile generation
-tilecloud-chain==1.6.0.dev4  # Tile generation
+tilecloud-chain==1.7.1  # Tile generation
 transaction==2.2.1  # commons, geoportal
 transifex-client==0.12.5  # Makefile, rq.filter: >=0.14
 translationstring==1.3  # admin
diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose.yaml.mako b/geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose.yaml.mako
index ae68d43169..4dce37397a 100644
--- a/geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose.yaml.mako
+++ b/geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose.yaml.mako
@@ -74,14 +74,14 @@ ${service_defaults('memcached', 11211)}\
 ${service_defaults('redis', 6379)}\
 
   tilecloudchain:
-    image: camptocamp/tilecloud-chain:1.6
+    image: camptocamp/tilecloud-chain:1.7
     user: www-data
     volumes_from:
       - config:ro
 ${service_defaults('tilecloudchain', 8080)}\
 
   tilegeneration_slave:
-    image: camptocamp/tilecloud-chain:1.6
+    image: camptocamp/tilecloud-chain:1.7
     user: www-data
     volumes_from:
       - config:ro
diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/create/tilegeneration/config.yaml.tmpl.mako_tmpl b/geoportal/c2cgeoportal_geoportal/scaffolds/create/tilegeneration/config.yaml.tmpl.mako_tmpl
index 9a21886033..89bfadaed4 100644
--- a/geoportal/c2cgeoportal_geoportal/scaffolds/create/tilegeneration/config.yaml.tmpl.mako_tmpl
+++ b/geoportal/c2cgeoportal_geoportal/scaffolds/create/tilegeneration/config.yaml.tmpl.mako_tmpl
@@ -101,6 +101,10 @@ generation:
     # maximum allowed consecutive errors, after it exit [default to 10]
     maxconsecutive_errors: 10
 
+redis:
+    url: '${tilegeneration_redis}'
+
+# Not used if the previous redis section is not commented out
 sqs:
     # The region where the SQS queue is
     region: eu-west-1
diff --git a/geoportal/c2cgeoportal_geoportal/scaffolds/update/CONST_vars.yaml_tmpl b/geoportal/c2cgeoportal_geoportal/scaffolds/update/CONST_vars.yaml_tmpl
index 7f7bfb3612..b83e1b4ab7 100644
--- a/geoportal/c2cgeoportal_geoportal/scaffolds/update/CONST_vars.yaml_tmpl
+++ b/geoportal/c2cgeoportal_geoportal/scaffolds/update/CONST_vars.yaml_tmpl
@@ -413,6 +413,7 @@ vars:
   memcached_host: '{MEMCACHED_HOST}'
   memcached_port: '{MEMCACHED_PORT}'
   tilegeneration_sqs_queue: '{TILEGENERATION_SQS_QUEUE}'
+  tilegeneration_redis: 'redis://{REDIS_HOST}:{REDIS_PORT}'
 
   pdfreport:
     print_url: '{print_url}'