Merge pull request #236 from Tigerfell/master

[chef.git] / roles / scorch.rb

diff --git a/roles/scorch.rb b/roles/scorch.rb
index 60adc7ad7420fa827c2da9c3670c79269dc48e41..07c2932e46230752ed72f621c3247b24b8eaf011 100644 (file)
--- a/roles/scorch.rb
+++ b/roles/scorch.rb
@@ -16,17 +16,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 +44,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.6"],
+    :versions => ["10"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -75,8 +64,8 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "9.6/main",
-      :postgis => "2.3"
+      :cluster => "10/main",
+      :postgis => "2.4"
     },
     :node_file => "/store/database/nodes",
     :styles => {