X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e73743b0d572ac0f2260790f37b0dc24a95aa8e4..2221b7a20232b4140e1748a637c7ca93d60c26c3:/roles/poldi.rb

diff --git a/roles/poldi.rb b/roles/poldi.rb
index 52b32e7e9..1c180ab8a 100644
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -57,20 +57,18 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.3"],
     :settings => {
       :defaults => {
         :shared_buffers => "10GB",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
-        :effective_cache_size => "48GB",
+        :effective_cache_size => "40GB",
         :fsync => "on"
       }
     }
   },
   :nominatim => {
-    :enabled => false,
     :flatnode_file => "/ssd-old/nominatim/nodes.store",
     :database => {
       :cluster => "9.3/main",
@@ -88,18 +86,6 @@ default_attributes(
         :pm => "static",
         :max_children => "10"
       }
-    },
-    :tablespaces => {
-      "Osm2pgsql_Data" => "aux",
-      "Osm2pgsql_Index" => "data",
-      "Place_Data" => "ssd2",
-      "Place_Index" => "ssd1",
-      "Address_Data" => "ssd2",
-      "Address_Index" => "ssd1",
-      "Search_Data" => "ssd1",
-      "Search_Index" => "ssd1",
-      "Aux_Data" => "aux",
-      "Aux_Index" => "aux"
     }
   }
 )
@@ -107,5 +93,5 @@ default_attributes(
 run_list(
   "role[ic]",
   "role[tyan-s7010]",
-  "role[nominatim]"
+  "role[nominatim-slave]"
 )