X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0149cef9a04df6abe6c616e966ba8b4f280c1ef5..5d420a8464d9266d47bdd452ec227c2b631adf1c:/roles/orm.rb

diff --git a/roles/orm.rb b/roles/orm.rb
index b5fb0f3b1..bc73e1d55 100644
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -2,78 +2,30 @@ name "orm"
 description "Master role applied to orm"
 
 default_attributes(
+  :apt => {
+    :sources => ["postgresql"]
+  },
   :devices => {
-    :ssdvol1tune => {
-      :comment => "Tune scheduler for SSD",
-      :type => "block",
-      :bus => "ata",
-      :serial => "SATA_Samsung_SSD_840S12SNEAD411116P",
-      :attrs => {
-        "queue/scheduler" => "noop",
-        "queue/nr_requests" => "256"
-      }
-    },
-    :ssdvol2tune => {
+    :ssd_samsung => {
       :comment => "Tune scheduler for SSD",
       :type => "block",
       :bus => "ata",
-      :serial => "SATA_Samsung_SSD_840S12SNEAD411110E",
+      :serial => "Samsung_SSD_840_PRO_Series_*",
       :attrs => {
         "queue/scheduler" => "noop",
-        "queue/nr_requests" => "256"
-      }
-    },
-    :arecavol1tune => {
-      :comment => "Tune scheduler for Areca",
-      :type => "block",
-      :bus => "scsi",
-      :serial => "2001b4d2049002450",
-      :attrs => {
-        "queue/scheduler" => "deadline",
-        "queue/nr_requests" => "512"
+        "queue/nr_requests" => "256",
+        "queue/read_ahead_kb" => "2048"
       }
     },
-    :arecavol2tune => {
+    :arecavoltune => {
       :comment => "Tune scheduler for Areca",
       :type => "block",
       :bus => "scsi",
-      :serial => "2001b4d2037331399",
+      :serial => "2001b4d20*",
       :attrs => {
         "queue/scheduler" => "deadline",
-        "queue/nr_requests" => "512"
-      }
-    },
-    :arecavol3tune => {
-      :comment => "Tune scheduler for Areca",
-      :type => "block",
-      :bus => "scsi",
-      :serial => "2001b4d2031365276",
-      :attrs => {
-        "queue/scheduler" => "deadline",
-        "queue/nr_requests" => "512"
-      }
-    }
-  },
-  :munin => {
-    :plugins => {
-      :ipmi_fans => {
-        :Sys6 => { :graph => "no" },
-        :Sys8 => { :graph => "no" }
-      },
-      :sensors_fan => {
-        :fan3 => { :graph => "no" },
-        :fan4 => { :graph => "no" },
-        :fan5 => { :graph => "no" },
-        :fan6 => { :graph => "no" },
-        :fan7 => { :graph => "no" },
-        :fan8 => { :graph => "no" },
-        :fan9 => { :graph => "no" },
-        :fan10 => { :graph => "no" },
-        :fan11 => { :graph => "no" },
-        :fan12 => { :graph => "no" }
-      },
-      :sensors_volt => {
-        :contacts => "null",
+        "queue/nr_requests" => "512",
+        "queue/read_ahead_kb" => "2048"
       }
     }
   },
@@ -94,7 +46,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => [ "9.1" ],
+    :versions => ["9.5"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -106,25 +58,36 @@ default_attributes(
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
-      :parameters => { 
+      :parameters => {
         "kernel.shmmax" => 9 * 1024 * 1024 * 1024,
         "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
       }
     }
   },
   :tile => {
-    :tile_directory => "/store/tiles",
-    :node_file => "/store/database/nodes"
+    :database => {
+      :cluster => "9.5/main"
+    },
+    :node_file => "/store/database/nodes",
+    :styles => {
+      :default => {
+        :tile_directories => [
+          { :name => "/store/tiles/default-low", :min_zoom => 0, :max_zoom => 17 },
+          { :name => "/store/tiles/default-high", :min_zoom => 18, :max_zoom => 19 }
+        ]
+      }
+    }
   }
 )
 
 override_attributes(
   :networking => {
-    :nameservers => [ "8.8.8.8", "8.8.4.4" ]
+    :nameservers => ["8.8.8.8", "8.8.4.4"]
   }
 )
 
 run_list(
   "role[ic]",
+  "role[tyan-s7010]",
   "role[tile]"
 )