X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/67c2aceb91955ff583c41807759d203a4478e4b1..fc4eb898566fa54244d2ec866389cc41bf080933:/roles/scorch.rb

diff --git a/roles/scorch.rb b/roles/scorch.rb
index c8f3b0aa0..76b4b78e1 100644
--- a/roles/scorch.rb
+++ b/roles/scorch.rb
@@ -16,20 +16,15 @@ 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 => {
+    :netplan => true,
     :interfaces => {
       :external_ipv4 => {
         :interface => "eth0",
@@ -50,7 +45,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.5"],
+    :versions => ["10"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -70,7 +65,8 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "9.5/main"
+      :cluster => "10/main",
+      :postgis => "2.4"
     },
     :node_file => "/store/database/nodes",
     :styles => {