X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/da4f47ac122ef3319553b7828c689c118945e2e0..1eebadd9e2c2ffe0013eddfc00248f55ad6e7648:/roles/scorch.rb

diff --git a/roles/scorch.rb b/roles/scorch.rb
index b22c905f9..a5c557474 100644
--- a/roles/scorch.rb
+++ b/roles/scorch.rb
@@ -2,9 +2,6 @@ name "scorch"
 description "Master role applied to scorch"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :devices => {
     :ssd_system => {
       :comment => "Tune scheduler for system disk",
@@ -16,17 +13,11 @@ default_attributes(
         "queue/nr_requests" => "256",
         "queue/read_ahead_kb" => "2048"
       }
-    },
-    :ssd_database => {
-      :comment => "Tune scheduler for database disk",
-      :type => "block",
-      :bus => "scsi",
-      :serial => "3600605b009bbf5601fd931c6dfac767f",
-      :attrs => {
-        "queue/scheduler" => "noop",
-        "queue/nr_requests" => "256",
-        "queue/read_ahead_kb" => "2048"
-      }
+    }
+  },
+  :hardware => {
+    :mcelog => {
+      :enabled => false
     }
   },
   :networking => {
@@ -50,7 +41,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.6"],
+    :versions => ["10"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -70,9 +61,9 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "9.6/main"
+      :cluster => "10/main",
+      :postgis => "2.4"
     },
-    :node_file => "/store/database/nodes",
     :styles => {
       :default => {
         :tile_directories => [