name template script correctly

[chef.git] / roles / poldi.rb

diff --git a/roles/poldi.rb b/roles/poldi.rb
index b9aa337dc896ea8f4630a554d5416d355298aaf4..1c180ab8aaea30229bb556963ebf10d5d4d55321 100644 (file)
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -47,24 +47,28 @@ default_attributes(
         :role => :external,
         :family => :inet,
         :address => "193.63.75.101"
+      },
+      :external_ipv6 => {
+        :interface => "eth1",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:630:12:500:2e0:81ff:fec5:333e"
       }
     }
   },
   :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",
@@ -82,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"
     }
   }
 )
@@ -101,5 +93,5 @@ default_attributes(
 run_list(
   "role[ic]",
   "role[tyan-s7010]",
-  "role[nominatim]"
+  "role[nominatim-slave]"
 )