X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/d0f9d158f91ee627fee991b9ccaeb2a44dfc909a..f4d9298947b4e2f3740236d9fe51aec7e63ce31e:/roles/orm.rb?ds=sidebyside

diff --git a/roles/orm.rb b/roles/orm.rb
index 1b49d0cfe..e1b1e5525 100644
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -26,32 +26,6 @@ default_attributes(
       }
     }
   },
-  :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",
-        :volt6 => {
-          :warning => "2.992:3.536"
-        }
-      }
-    }
-  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -81,7 +55,7 @@ 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
       }
@@ -108,5 +82,6 @@ override_attributes(
 
 run_list(
   "role[ic]",
+  "role[tyan-s7010]",
   "role[tile]"
 )