From 4fdc4a51449d09fcff5417c8ccf56d4614806bda Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Fri, 2 Jul 2021 17:06:58 +0200
Subject: Add pv for psql + upgrade postgres to 13.3

---
 app/postgres/deploy/postgres.hcl      | 16 ++++++++--------
 os/config/roles/common/tasks/main.yml |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/postgres/deploy/postgres.hcl b/app/postgres/deploy/postgres.hcl
index 075a77f..e8014e3 100644
--- a/app/postgres/deploy/postgres.hcl
+++ b/app/postgres/deploy/postgres.hcl
@@ -1,4 +1,4 @@
-job "postgres9.6" {
+job "postgres13.3" {
   datacenters = ["dc1"]
   type = "system"
   priority = 90
@@ -20,12 +20,12 @@ job "postgres9.6" {
       driver = "docker"
 
       config {
-        image = "superboum/amd64_postgres:v5"
+        image = "superboum/amd64_postgres:v10"
         network_mode = "host" 
         readonly_rootfs = false
         command = "/usr/local/bin/stolon-sentinel"
         args = [
-          "--cluster-name", "pissenlit",
+          "--cluster-name", "chelidoine",
           "--store-backend", "consul",
           "--store-endpoints", "http://consul.service.2.cluster.deuxfleurs.fr:8500",
         ]
@@ -39,12 +39,12 @@ job "postgres9.6" {
       driver = "docker"
 
       config {
-        image = "superboum/amd64_postgres:v5"
+        image = "superboum/amd64_postgres:v10"
         network_mode = "host" 
         readonly_rootfs = false
         command = "/usr/local/bin/stolon-proxy"
         args = [
-          "--cluster-name", "pissenlit",
+          "--cluster-name", "chelidoine",
           "--store-backend", "consul",
           "--store-endpoints", "http://consul.service.2.cluster.deuxfleurs.fr:8500",
           "--port", "${NOMAD_PORT_psql_proxy_port}",
@@ -81,12 +81,12 @@ job "postgres9.6" {
       driver = "docker"
 
       config {
-        image = "superboum/amd64_postgres:v5"
+        image = "superboum/amd64_postgres:v10"
         network_mode = "host" 
         readonly_rootfs = false
         command = "/usr/local/bin/stolon-keeper"
         args = [
-          "--cluster-name", "pissenlit",
+          "--cluster-name", "chelidoine",
           "--store-backend", "consul",
           "--store-endpoints", "http://consul.service.2.cluster.deuxfleurs.fr:8500",
           "--data-dir", "/mnt/persist",
@@ -95,7 +95,7 @@ job "postgres9.6" {
           "--pg-repl-password", "${PG_REPL_PWD}",
           "--pg-listen-address", "${attr.unique.network.ip-address}",
           "--pg-port", "${NOMAD_PORT_psql_port}",
-          "--pg-bin-path", "/usr/lib/postgresql/9.6/bin/"
+          "--pg-bin-path", "/usr/lib/postgresql/13/bin/"
         ]
         ports = [ "psql_port" ]
         volumes = [
diff --git a/os/config/roles/common/tasks/main.yml b/os/config/roles/common/tasks/main.yml
index e817451..1039b1e 100644
--- a/os/config/roles/common/tasks/main.yml
+++ b/os/config/roles/common/tasks/main.yml
@@ -42,6 +42,7 @@
       - sudo
       - ethtool
       - pciutils
+      - pv
     state: present
 
 - name: "Passwordless sudo"
-- 
cgit v1.2.3