Update yournavigation cookbook for Ubuntu 16.04

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 68eaefb133ba77a80a295c10f5bdeda94bc3226b..f7a9347b63f3fa37630870a7a74cc8ef107ad3dc 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -19,10 +19,10 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

+    :versions => ["9.3"],

     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",
     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",

-        :shared_buffers => "10GB",

         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",


@@ -31,7 +31,6 @@ default_attributes(
     }
   },
   :nominatim => {
     }
   },
   :nominatim => {

-    :enabled => true,

     :flatnode_file => "/ssd/nominatim/nodes.store",
     :database => {
       :cluster => "9.3/main",
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :database => {
       :cluster => "9.3/main",


@@ -49,11 +48,21 @@ default_attributes(
         :pm => "static",
         :max_children => "10"
       }
         :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]",
     }
   }
 )
 
 run_list(
   "role[ucl-wolfson]",

-  "role[nominatim-master]"
+  "role[nominatim-standalone]"

 )
 )