Push postgresql version selection down to nodes for nominamtim

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index eb8d29526339094ad4a4629e6fd93f3dda23f674..ef153a918f838379d2143c76ec5a17542985e369 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -28,6 +28,7 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

+    :versions => ["9.4"],

     :settings => {
       :defaults => {
         :work_mem => "300MB",
     :settings => {
       :defaults => {
         :work_mem => "300MB",

diff --git a/roles/nominatim-master.rb b/roles/nominatim-master.rb
index bec27ef1eb51e76901cf90038f02b8f49bffade3..85baaf89258e5d590b606df4f715eafe5a081771 100644 (file)
--- 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 => {
 
 default_attributes(
   :postgresql => {

-    :versions => ["9.3"],

     :settings => {
       :defaults => {
         :wal_level => "hot_standby",
     :settings => {
       :defaults => {
         :wal_level => "hot_standby",

diff --git a/roles/nominatim-slave.rb b/roles/nominatim-slave.rb
index fd2691cd6d22569eedb844768ae43835ca55c587..a161d90cd17d0ebf5481c931f42108c883beacc7 100644 (file)
--- 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 => {
 
 default_attributes(
   :postgresql => {

-    :versions => ["9.3"],

     :settings => {
       :defaults => {
         :hot_standby => "on",
     :settings => {
       :defaults => {
         :hot_standby => "on",

diff --git a/roles/nominatim-standalone.rb b/roles/nominatim-standalone.rb
index 98bdee2c783cb9ba0a456050139a541fc71921b2..561692c8f3de0010b3024388b14d25efefaec0e7 100644 (file)
--- a/roles/nominatim-standalone.rb
+++ b/roles/nominatim-standalone.rb
@@ -5,9 +5,6 @@ default_attributes(
   :apt => {
     :sources => ["postgresql"]
   },
   :apt => {
     :sources => ["postgresql"]
   },

-  :postgresql => {
-    :versions => ["9.4"]
-  },

   :nominatim => {
     :enable_backup => false
   }
   :nominatim => {
     :enable_backup => false
   }