X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/fb2e24074f3c4748f319312a2c1fe729e47e6155..6d5ddf3137c047a9933d1f0ca3be2db55dab148b:/roles/poldi.rb?ds=sidebyside

diff --git a/roles/poldi.rb b/roles/poldi.rb
index 6a92cfc90..7fc730a31 100644
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -3,31 +3,25 @@ description "Master role applied to poldi"
 
 default_attributes(
   :devices => {
-    :ubuntu => {
-      :comment => "RAID array backing the ubuntu volume group",
+    :areca_ld_tune => {
+      :comment => "RAID arrays on areca",
       :type => "block",
       :bus => "scsi",
-      :serial => "20004d927fffff800",
+      :serial => "20004d927fffff*",
       :attrs => {
-        "queue/scheduler" => "deadline"
+        "queue/scheduler" => "deadline",
+        "queue/read_ahead_kb" => "2048"
       }
     },
-    :nominatim => {
-      :comment => "RAID array backing the nominatim volume group",
+    :ssd_samsung_tune => {
+      :comment => "Tune Samsung SSD",
       :type => "block",
-      :bus => "scsi",
-      :serial => "20004d927fffff801",
+      :bus => "ata",
+      :serial => "Samsung_SSD_840_PRO_Series_*",
       :attrs => {
-        "queue/scheduler" => "deadline"
-      }
-    },
-    :nominatim2 => {
-      :comment => "RAID array backing the nominatim2 volume group",
-      :type => "block",
-      :bus => "scsi",
-      :serial => "20004d927fffff802",
-      :attrs => {
-        "queue/scheduler" => "deadline"
+        "queue/scheduler" => "noop",
+        "queue/nr_requests" => "256",
+        "queue/read_ahead_kb" => "2048"
       }
     }
   },
@@ -35,7 +29,7 @@ default_attributes(
     :md_tune => {
       :comment => "Tune the md sync performance so as not to kill system performance",
       :parameters => {
-        "block/md0/md/sync_speed_min" => "100",
+        "block/md0/md/sync_speed_min" => "1",
         "block/md0/md/sync_speed_max" => "100000"
       }
     }
@@ -46,30 +40,58 @@ default_attributes(
         :interface => "eth0",
         :role => :internal,
         :family => :inet,
-        :address => "10.0.0.16"
+        :address => "146.179.159.164"
       },
       :external_ipv4 => {
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.106"
+        :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 => "24GB",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
-        :effective_cache_size => "48GB"
+        :effective_cache_size => "40GB",
+        :fsync => "on"
+      }
+    }
+  },
+  :nominatim => {
+    :flatnode_file => "/ssd-old/nominatim/nodes.store",
+    :database => {
+      :cluster => "9.3/main",
+      :dbname => "nominatim",
+      :postgis => "2.1"
+    },
+    :fpm_pools => {
+      :www => {
+        :port => "8000",
+        :pm => "dynamic",
+        :max_children => "60"
+      },
+      :bulk => {
+        :port => "8001",
+        :pm => "static",
+        :max_children => "10"
       }
     }
   }
 )
 
 run_list(
-  "role[ucl-internal]",
-  "role[nominatim]"
+  "role[ic]",
+  "role[tyan-s7010]",
+  "role[nominatim-standalone]"
 )