X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/fc644b32403b63672bd1de6b9676efec559e5961..b024bc5219539e566463d63349a592330da53bc1:/roles/scorch.rb

diff --git a/roles/scorch.rb b/roles/scorch.rb
index 60adc7ad7..0649374f4 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,80 +13,28 @@ 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 => {
     :interfaces => {
-      :external_ipv4 => {
+      :external => {
         :interface => "eth0",
         :role => :external,
-        :family => :inet,
-        :address => "176.31.235.79",
-        :prefix => "24",
-        :gateway => "176.31.235.254"
-      },
-      :external_ipv6 => {
-        :interface => "eth0",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:41d0:2:fc4f::1",
-        :prefix => "64",
-        :gateway => "2001:41d0:2:fcff:ff:ff:ff:ff"
-      }
-    }
-  },
-  :postgresql => {
-    :versions => ["9.6"],
-    :settings => {
-      :defaults => {
-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",
-        :effective_cache_size => "16GB"
-      }
-    }
-  },
-  :sysctl => {
-    :postgres => {
-      :comment => "Increase shared memory for postgres",
-      :parameters => {
-        "kernel.shmmax" => 9 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
-      }
-    }
-  },
-  :tile => {
-    :database => {
-      :cluster => "9.6/main",
-      :postgis => "2.3"
-    },
-    :node_file => "/store/database/nodes",
-    :styles => {
-      :default => {
-        :tile_directories => [
-          { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
-        ]
+        :inet => {
+          :address => "176.31.235.79",
+          :prefix => "24",
+          :gateway => "176.31.235.254"
+        },
+        :inet6 => {
+          :address => "2001:41d0:2:fc4f::1",
+          :prefix => "64",
+          :gateway => "2001:41d0:2:fcff:ff:ff:ff:ff"
+        }
       }
     }
   }
 )
 
 run_list(
-  "role[ovh]",
-  "role[tile]"
+  "role[ovh]"
 )