Use new style extension initialisation for osmtaginfo

[chef.git] / roles / scorch.rb

diff --git a/roles/scorch.rb b/roles/scorch.rb
index d6823bca05cd51c815d5e872a9c73a8c5d529e45..876fb6905f4d8c4016b3040f00c14eb0c75a034a 100644 (file)
--- a/roles/scorch.rb
+++ b/roles/scorch.rb
@@ -2,9 +2,6 @@ name "scorch"
 description "Master role applied to scorch"
 
 default_attributes(
 description "Master role applied to scorch"
 
 default_attributes(

-  :apt => {
-    :sources => ["postgresql"]
-  },

   :devices => {
     :ssd_system => {
       :comment => "Tune scheduler for system disk",
   :devices => {
     :ssd_system => {
       :comment => "Tune scheduler for system disk",


@@ -16,17 +13,11 @@ default_attributes(
         "queue/nr_requests" => "256",
         "queue/read_ahead_kb" => "2048"
       }
         "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 => {
     }
   },
   :networking => {


@@ -50,7 +41,6 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

-    :versions => ["9.6"],

     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",


@@ -70,12 +60,11 @@ default_attributes(
   },
   :tile => {
     :database => {
   },
   :tile => {
     :database => {

-      :cluster => "9.6/main"
+      :cluster => "12/main",
+      :postgis => "3"

     },
     },

-    :node_file => "/store/database/nodes",

     :styles => {
       :default => {
     :styles => {
       :default => {

-        :revision => "v4.0.0",

         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]
         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]