X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/99e9133ef366db61cf0c82c688b64346f9d5bd61..67c05c6c4b484a6cdac9473b4e6951e5c76c42a3:/roles/scorch.rb

diff --git a/roles/scorch.rb b/roles/scorch.rb
index be1e75c8c..07c2932e4 100644
--- a/roles/scorch.rb
+++ b/roles/scorch.rb
@@ -16,17 +16,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 => {
@@ -43,14 +37,14 @@ default_attributes(
         :interface => "eth0",
         :role => :external,
         :family => :inet6,
-        :address => "2001:41d0:2:fc4f::",
+        :address => "2001:41d0:2:fc4f::1",
         :prefix => "64",
-        :gateway => "fe80::12bd:18ff:fee5:2280"
+        :gateway => "2001:41d0:2:fcff:ff:ff:ff:ff"
       }
     }
   },
   :postgresql => {
-    :versions => ["9.5"],
+    :versions => ["10"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -70,7 +64,8 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "9.5/main"
+      :cluster => "10/main",
+      :postgis => "2.4"
     },
     :node_file => "/store/database/nodes",
     :styles => {