From d0661470ef7a5a433d4c56a576a7d0eecf9ad9af Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 25 Mar 2020 22:57:33 +0000
Subject: [PATCH] Make sure tile cookbook only requests the required postgres
 version

---
 cookbooks/tile/attributes/default.rb | 2 +-
 roles/albi.rb                        | 1 -
 roles/bowser.rb                      | 1 -
 roles/odin.rb                        | 1 -
 roles/pyrene.rb                      | 1 -
 roles/rhaegal.rb                     | 1 -
 roles/scorch.rb                      | 1 -
 roles/ysera.rb                       | 1 -
 8 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/cookbooks/tile/attributes/default.rb b/cookbooks/tile/attributes/default.rb
index 314d5a61c..a9636c134 100644
--- a/cookbooks/tile/attributes/default.rb
+++ b/cookbooks/tile/attributes/default.rb
@@ -9,6 +9,6 @@ default[:tile][:database][:tag_transform_script] = nil
 default[:tile][:data] = {}
 default[:tile][:styles] = {}
 
-default[:postgresql][:versions] |= ["12"]
+default[:postgresql][:versions] |= [node[:tile][:database][:cluster].split("/").first]
 
 default[:accounts][:users][:tile][:status] = :role
diff --git a/roles/albi.rb b/roles/albi.rb
index baa5fa0bd..296497906 100644
--- a/roles/albi.rb
+++ b/roles/albi.rb
@@ -23,7 +23,6 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["12"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
diff --git a/roles/bowser.rb b/roles/bowser.rb
index 7f644a5ff..17c9f548d 100644
--- a/roles/bowser.rb
+++ b/roles/bowser.rb
@@ -18,7 +18,6 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["12"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
diff --git a/roles/odin.rb b/roles/odin.rb
index de22a363c..ac19a286d 100644
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -28,7 +28,6 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["10"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
diff --git a/roles/pyrene.rb b/roles/pyrene.rb
index f320526a8..210084691 100644
--- a/roles/pyrene.rb
+++ b/roles/pyrene.rb
@@ -27,7 +27,6 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["10"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
diff --git a/roles/rhaegal.rb b/roles/rhaegal.rb
index 6ff245d85..cda8a602f 100644
--- a/roles/rhaegal.rb
+++ b/roles/rhaegal.rb
@@ -44,7 +44,6 @@ default_attributes(
     ]
   },
   :postgresql => {
-    :versions => ["10"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
diff --git a/roles/scorch.rb b/roles/scorch.rb
index 05dfe84c7..8378856ee 100644
--- a/roles/scorch.rb
+++ b/roles/scorch.rb
@@ -41,7 +41,6 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["12"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
diff --git a/roles/ysera.rb b/roles/ysera.rb
index 025a48235..45ce22e81 100644
--- a/roles/ysera.rb
+++ b/roles/ysera.rb
@@ -19,7 +19,6 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["12"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
-- 
2.43.2