X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/1cb9a64073aa6cffccf01930672295a0d26e229d..523cc1f7b407269fd07c86fc4ab5f6c8c3f7230f:/roles/yevaud.rb

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index 0489c69d2..37b6995c4 100644
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -2,79 +2,129 @@ name "yevaud"
 description "Master role applied to yevaud"
 
 default_attributes(
+  :apt => {
+    :sources => ["postgresql"]
+  },
+  :devices => {
+    :osdisktune1 => {
+      :comment => "Tune os disk",
+      :type => "block",
+      :bus => "scsi",
+      :serial => "20004d927fffff800",
+      :attrs => {
+        "queue/scheduler" => "deadline",
+        "queue/nr_requests" => "512"
+      }
+    },
+    :disktune2 => {
+      :comment => "Tune database array",
+      :type => "block",
+      :bus => "scsi",
+      :serial => "20004d927fffff802",
+      :attrs => {
+        "queue/scheduler" => "deadline",
+        "queue/nr_requests" => "512"
+      }
+    },
+    :disktune3 => {
+      :comment => "Tune os disk",
+      :type => "block",
+      :bus => "scsi",
+      :serial => "20004d927fffff803",
+      :attrs => {
+        "queue/scheduler" => "deadline",
+        "queue/nr_requests" => "512"
+      }
+    },
+    :ssdtune1 => {
+      :comment => "Tune ssd disk",
+      :type => "block",
+      :bus => "ata",
+      :serial => "INTEL_SSDSA2CW600G3_CVPR111401HP600FGN",
+      :attrs => {
+        "queue/scheduler" => "noop",
+        "queue/nr_requests" => "512",
+        "queue/read_ahead_kb" => "2048"
+      }
+    }
+  },
   :munin => {
     :plugins => {
       :cpu => {
-        :system => { 
+        :system => {
           :warning => 500,
           :critical => 600
         }
       },
       :load => {
-        :load => { 
-          :warning => 150,
-          :critical => 200
+        :load => {
+          :warning => 400,
+          :critical => 500
         }
       },
-      :ipmi_fans => {
-        :contacts => "null",
-      },
-      :ipmi_temp => {
-        :contacts => "null",
-      },
-      :sensors_fan => {
-        :contacts => "null"
-      },
       :sensors_temp => {
-        :contacts => "null"
-      },
-      :sensors_volt => {
-        :contacts => "null"
+        :temp1 => { :warning => 82 },
+        :temp2 => { :warning => 82 },
+        :temp3 => { :warning => 82 },
+        :temp4 => { :warning => 82 },
+        :temp5 => { :warning => 82 },
+        :temp6 => { :warning => 82 }
       }
     }
   },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth0",
+        :interface => "eth0.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.15"
       },
       :external_ipv4 => {
-        :interface => "eth1",
+        :interface => "eth0.2800",
         :role => :external,
         :family => :inet,
-        :address => "128.40.168.104"
+        :address => "193.60.236.22"
       }
     }
   },
   :postgresql => {
-    :versions => [ "9.1" ],
+    :versions => ["10"],
     :settings => {
       :defaults => {
-        :shared_buffers => "3GB",
+        :shared_buffers => "8GB",
         :maintenance_work_mem => "7144MB",
-        :effective_cache_size => "8GB"
+        :effective_cache_size => "16GB"
       }
     }
   },
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
-      :parameters => { 
-        "kernel.shmmax" => 4 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 4 * 1024 * 1024 * 1024 / 4096
+      :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 => "10/main",
+      :postgis => "2.4"
+    },
+    :node_file => "/store/database/nodes",
+    :styles => {
+      :default => {
+        :tile_directories => [
+          { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
+        ]
+      }
+    }
   }
 )
 
 run_list(
-  "role[ucl-internal]",
+  "role[ucl]",
+  "role[tyan-s7010]",
   "role[tile]"
 )