Remove nominatim role from dulcy temporarily

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index e40e048343a1c93d8544c77eb2ee5c71855ab640..9b38f7abebfaa18e8efa3d5e2ad3b8cc81e7b89e 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -1,6 +1,5 @@
 name "dulcy"
 name "dulcy"

-description "Master role applied to dulcy
-"
+description "Master role applied to dulcy"

 
 default_attributes(
   :networking => {
 
 default_attributes(
   :networking => {


@@ -28,6 +27,7 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

+    :versions => ["9.5"],

     :settings => {
       :defaults => {
         :work_mem => "300MB",
     :settings => {
       :defaults => {
         :work_mem => "300MB",


@@ -41,27 +41,24 @@ default_attributes(
   :nominatim => {
     :enabled => false,
     :flatnode_file => "/ssd/nominatim/nodes.store",
   :nominatim => {
     :enabled => false,
     :flatnode_file => "/ssd/nominatim/nodes.store",

+    :logdir => "/ssd/nominatim/log",

     :database => {
     :database => {

-      :cluster => "9.4/main",
+      :cluster => "9.5/main",

       :dbname => "nominatim",
       :dbname => "nominatim",

-      :postgis => "2.1"
-    },
-    :fpm_pools => {
-      :www => {
-        :port => "8000",
-        :pm => "dynamic",
-        :max_children => "60"
-      },
-      :bulk => {
-        :port => "8001",
-        :pm => "static",
-        :max_children => "10"
+      :postgis => "2.2"
+    }
+  },
+  :sysfs => {
+    :md_tune => {
+      :comment => "Enable request merging for NVMe devices",
+      :parameters => {
+        "block/nvme0n1/queue/nomerges" => "1",
+        "block/nvme1n1/queue/nomerges" => "1"

       }
     }
   }
 )
 
 run_list(
       }
     }
   }
 )
 
 run_list(

-  "role[ic]",
-  "role[nominatim-standalone]"
+  "role[ic]"

 )
 )