imagery: add remainder of os_sv_diff

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index df40a0e3312d00b2510f68a6090299735a1f8087..50e4d3b2d9faf705d4200b400c58ed85a593afd7 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -28,18 +28,21 @@ default_attributes(
     }
   },
   :postgresql => {
+    :versions => ["9.4"],
     :settings => {
       :defaults => {
-        :shared_buffers => "10GB",
-        :work_mem => "160MB",
+        :work_mem => "300MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
-        :effective_cache_size => "60GB"
+        :effective_cache_size => "60GB",
+        :fsync => "on"
       }
     }
   },
   :nominatim => {
+    :enabled => false,
     :flatnode_file => "/ssd/nominatim/nodes.store",
+    :logdir => "/ssd/nominatim/log",
     :database => {
       :cluster => "9.4/main",
       :dbname => "nominatim",
@@ -57,6 +60,15 @@ default_attributes(
         :max_children => "10"
       }
     }
+  },
+  :sysfs => {
+    :md_tune => {
+      :comment => "Enable request merging for NVMe devices",
+      :parameters => {
+        "block/nvme0n1/queue/nomerges" => "1",
+        "block/nvme1n1/queue/nomerges" => "1"
+      }
+    }
   }
 )