Make prometheus appear as a valid sender on shenron

[chef.git] / roles / shenron.rb

diff --git a/roles/shenron.rb b/roles/shenron.rb
index 9226ff0de7da1ff9fd3942335f54965d9afc0efd..56e2a3ed3afa845f0fbb727c8e3b5a8c0fb18f43 100644 (file)
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -10,29 +10,20 @@ default_attributes(
     }
   },
   :hardware => {
-    :mcelog => {
-      :enabled => false
+    :hwmon => {
+      "platform_it87_552" => {
+        :ignore => %w[in6]
+      }
     },
     :modules => [
       "it87"
     ]
-  },
-  :openvpn => {
-    :address => "10.0.16.3",
-    :tunnels => {
-      :shenron2ucl => {
-        :port => "1194",
-        :mode => "server",
-        :peer => {
-          :host => "ridley.openstreetmap.org"
-        }
-      }
-    }
   }
 )
 
 override_attributes(
   :networking => {
+    :dnssec => "false",
     :interfaces => {
       :external_ipv4 => {
         :interface => "eth0",
@@ -56,12 +47,6 @@ override_attributes(
 
 run_list(
   "role[bytemark]",
-  "role[mail]",
   "role[lists]",
-  "role[subversion]",
-  "role[trac]",
-  "role[osqa]",
-  "role[irc]",
-  "recipe[blogs]",
-  "recipe[openvpn]"
+  "role[osqa]"
 )