Remove nominatim role from pummelzacken

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index aa080cde10d8c85dd8a4f91008996a5efd41038e..506aa4ec003e34e68fd9f70fca01c18cca04bb8b 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -19,10 +19,10 @@ default_attributes(
     }
   },
   :postgresql => {
+    :versions => ["9.3"],
     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",
-        :shared_buffers => "10GB",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
@@ -37,24 +37,19 @@ default_attributes(
       :dbname => "nominatim",
       :postgis => "2.1"
     },
-    :fpm_pools => {
-      :www => {
-        :port => "8000",
-        :pm => "dynamic",
-        :max_children => "60"
-      },
-      :bulk => {
-        :port => "8001",
-        :pm => "static",
-        :max_children => "10"
-      }
-    },
     :redirects => {
     }
+  },
+  :hardware => {
+    :grub => {
+      # lock kernel to 3.16.0-46 due to some issue with igb driver
+      # see https://github.com/openstreetmap/operations/issues/45
+      # for more information.
+      :kernel => "3.16.0-46"
+    }
   }
 )
 
 run_list(
-  "role[ucl-wolfson]",
-  "role[nominatim-master]"
+  "role[ucl-wolfson]"
 )