Switch to using gdnsd for geodns

[chef.git] / roles / poldi.rb

diff --git a/roles/poldi.rb b/roles/poldi.rb
index 55d5c038d63d466d1942be4a9d5b460298f8b284..94b2ea6839eff77b1714f41ad9f196029233682c 100644 (file)
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -66,6 +66,7 @@ default_attributes(
     }
   },
   :nominatim => {
+    :enabled => false,
     :database => {
         :cluster => "9.1/main",
         :dbname => "nominatim",
@@ -81,32 +82,11 @@ default_attributes(
             :max_children => "10"
         }
     }
-  },
-  :munin => {
-    :plugins => {
-      :ipmi_fans => {
-        :Sys3Front1 => { :graph => "no" },
-        :Sys4Front2 => { :graph => "no" },
-        :Sys5Rear1 => { :graph => "no" },
-        :Sys6 => { :graph => "no" },
-        :Sys7 => { :graph => "no" },
-        :Sys8 => { :graph => "no" },
-        :Sys9 => { :graph => "no" },
-        :Sys10 => { :graph => "no" }
-      },
-      :sensors_volt => {
-        :volt6 => {
-          :warning => "2.992:3.536"
-        },
-        :volt10 => {
-          :warning => "2.71:3.29"
-        }
-      }
-    }
   }
 )
 
 run_list(
   "role[ucl-wolfson]",
+  "role[tyan-s7010]",
   "role[nominatim]"
 )