Bump cookstyle from 7.30.4 to 7.31.1

[chef.git] / roles / ridgeback.rb

diff --git a/roles/ridgeback.rb b/roles/ridgeback.rb
index 90f1c11bd107515788de9cc3ff2ae3d9fb8504ee..75ddb901cd23d30ba118597751707ad05c9ac0ff 100644 (file)
--- a/roles/ridgeback.rb
+++ b/roles/ridgeback.rb
@@ -2,6 +2,31 @@ name "ridgeback"
 description "Master role applied to ridgeback"
 
 default_attributes(
 description "Master role applied to ridgeback"
 
 default_attributes(

+  :hardware => {
+    :ipmi => {
+      :excluded_sensors => [19, 20, 21, 22]
+    }
+  },
+  :munin => {
+    :plugins => {
+      :ipmi_fans => {
+        :Fan4 => { :graph => "no", :warning => "0:" },
+        :Fan5 => { :graph => "no", :warning => "0:" },
+        :Fan6 => { :graph => "no", :warning => "0:" },
+        :Fan7CPU1 => { :graph => "no", :warning => "0:" }
+      },
+      :smart_sda => {
+        :smartctl_exit_status => {
+          :warning => 8
+        }
+      },
+      :smart_sdb => {
+        :smartctl_exit_status => {
+          :warning => 8
+        }
+      }
+    }
+  },

   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {


@@ -18,32 +43,10 @@ default_attributes(
     :md_tune => {
       :comment => "Tune the md sync performance so as not to kill system performance",
       :parameters => {
     :md_tune => {
       :comment => "Tune the md sync performance so as not to kill system performance",
       :parameters => {

-        "block/md0/md/sync_speed_min" => "10",
-        "block/md0/md/sync_speed_max" => "10000",
-        "block/md1/md/sync_speed_min" => "10",
-        "block/md1/md/sync_speed_max" => "10000"
-      }
-    }
-  },
-  :squid => {
-    :cache_mem => "5500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "oslo.render.openstreetmap.org",
-    :tile_siblings => [
-      "fume.openstreetmap.org",
-      "trogdor.openstreetmap.org",
-      "tabaluga.openstreetmap.org",
-      "nepomuk.openstreetmap.org"
-    ]
-  },
-  :munin => {
-    :plugins => {
-      :smart_sdb => {
-        :smartctl_exit_status => {
-          :warning => 8
-        }
+        "block/md0/md/sync_speed_min" => "1",
+        "block/md0/md/sync_speed_max" => "100000",
+        "block/md1/md/sync_speed_min" => "1",
+        "block/md1/md/sync_speed_max" => "100000"

       }
     }
   }
       }
     }
   }


@@ -51,5 +54,5 @@ default_attributes(
 
 run_list(
   "role[blix-no]",
 
 run_list(
   "role[blix-no]",

-  "role[tilecache]"
+  "role[geodns]"

 )
 )