Make sure tile cookbook only requests the required postgres version

diff --git a/cookbooks/tile/attributes/default.rb b/cookbooks/tile/attributes/default.rb
index 314d5a61c96739b0f98f24155d28d7349946e721..a9636c1341f9128764941494ac2cc9f30b33eec7 100644 (file)
--- 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 baa5fa0bdc0e916aa9757c2832c9c59ec4cc4a2e..296497906a8c446011179a6372f420fb465295f8 100644 (file)
--- 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 7f644a5ff56d47a10056b1a850044d5090157914..17c9f548ddf5a7034b648fe44e02921244d7367d 100644 (file)
--- 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 de22a363ce872af7f8bd001f33c5ffaa3e524be4..ac19a286d84aeb64fd8000a0ab16ae610ff07cbd 100644 (file)
--- 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 f320526a89256b21aaf95ab7bcb069111c7f6d68..2100846919e4f3b71ec0974d9acc5e8608a75817 100644 (file)
--- 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 6ff245d85a6e24b199177643e8c3356ff4caa935..cda8a602f1714df37db58bc4b525933a6ac3d226 100644 (file)
--- 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 05dfe84c7c9fb192f9b404e4a53e0bc23f84585c..8378856ee17a1ee3a8e81638f78d1fbd1624f871 100644 (file)
--- 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 025a48235a4616dd4c3e15e5b168f4a4f5178008..45ce22e81dc037923b655ae763f5e3b69c17e296 100644 (file)
--- a/roles/ysera.rb
+++ b/roles/ysera.rb
@@ -19,7 +19,6 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["12"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",