From: Tom Hughes <tom@compton.nu>
Date: Sat, 14 Mar 2015 15:50:57 +0000 (+0000)
Subject: Merge duplicate hash entries
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/e6a82f6cb415dba275e1fab32b37e24eb12c7603?ds=sidebyside

Merge duplicate hash entries
---

diff --git a/roles/ridgeback.rb b/roles/ridgeback.rb
index a68023042..e8d1a4ff4 100644
--- a/roles/ridgeback.rb
+++ b/roles/ridgeback.rb
@@ -9,6 +9,16 @@ default_attributes(
         :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
+        }
       }
     }
   },
@@ -50,20 +60,6 @@ default_attributes(
       "gorynych.openstreetmap.org",
       "simurgh.openstreetmap.org"
     ]
-  },
-  :munin => {
-    :plugins => {
-      :smart_sda => {
-        :smartctl_exit_status => {
-          :warning => 8
-        }
-      },
-      :smart_sdb => {
-        :smartctl_exit_status => {
-          :warning => 8
-        }
-      }
-    }
   }
 )