X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1cd8cc40ed031f2e5cb44460d040d0211b9f9d7a..f9e3e2a61aca2a356d5e3f69b3f3f6f3c6986ce9:/roles/scorch.rb?ds=inline

diff --git a/roles/scorch.rb b/roles/scorch.rb
index 5c400300b..0775afde8 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,6 @@ 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 => {
@@ -55,7 +41,6 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.6"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -75,9 +60,10 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "9.6/main"
+      :cluster => "14/main",
+      :postgis => "3"
     },
-    :node_file => "/store/database/nodes",
+    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [