From: Tom Hughes <tom@compton.nu>
Date: Tue, 17 May 2016 08:07:53 +0000 (+0100)
Subject: Push postgresql version selection down to nodes for nominamtim
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/dbf7c55e6db5cfa92c0702bada70d4d9757fa39a?hp=956ffe2008afb266d5fa00010e642e8af03c48b0;ds=sidebyside

Push postgresql version selection down to nodes for nominamtim
---

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index eb8d29526..ef153a918 100644
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -28,6 +28,7 @@ default_attributes(
     }
   },
   :postgresql => {
+    :versions => ["9.4"],
     :settings => {
       :defaults => {
         :work_mem => "300MB",
diff --git a/roles/nominatim-master.rb b/roles/nominatim-master.rb
index bec27ef1e..85baaf892 100644
--- a/roles/nominatim-master.rb
+++ b/roles/nominatim-master.rb
@@ -3,7 +3,6 @@ description "Role applied to the master nominatim server"
 
 default_attributes(
   :postgresql => {
-    :versions => ["9.3"],
     :settings => {
       :defaults => {
         :wal_level => "hot_standby",
diff --git a/roles/nominatim-slave.rb b/roles/nominatim-slave.rb
index fd2691cd6..a161d90cd 100644
--- a/roles/nominatim-slave.rb
+++ b/roles/nominatim-slave.rb
@@ -3,7 +3,6 @@ description "Role applied to all slave nominatim servers"
 
 default_attributes(
   :postgresql => {
-    :versions => ["9.3"],
     :settings => {
       :defaults => {
         :hot_standby => "on",
diff --git a/roles/nominatim-standalone.rb b/roles/nominatim-standalone.rb
index 98bdee2c7..561692c8f 100644
--- a/roles/nominatim-standalone.rb
+++ b/roles/nominatim-standalone.rb
@@ -5,9 +5,6 @@ default_attributes(
   :apt => {
     :sources => ["postgresql"]
   },
-  :postgresql => {
-    :versions => ["9.4"]
-  },
   :nominatim => {
     :enable_backup => false
   }