Merge remote-tracking branch 'tigerfell/pr257'

[chef.git] / roles / shenron.rb

diff --git a/roles/shenron.rb b/roles/shenron.rb
index b5cb9d559562b57244d40d23f68fad984e4f3c17..c57441b1149a6adc62090b4c8a93d40d302b3552 100644 (file)
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -10,6 +10,11 @@ default_attributes(
     }
   },
   :hardware => {
+    :hwmon => {
+      "platform_it87_552" => {
+        :ignore => %w[in6]
+      }
+    },
     :mcelog => {
       :enabled => false
     },
@@ -21,6 +26,7 @@ default_attributes(
 
 override_attributes(
   :networking => {
+    :dnssec => "false",
     :interfaces => {
       :external_ipv4 => {
         :interface => "eth0",
@@ -39,7 +45,7 @@ override_attributes(
         :gateway => "fe80::1"
       }
     },
-    :nameservers => ["1.1.1.1", "1.0.0.1", "2606:4700:4700::1111", "2606:4700:4700::1001"],
+    :nameservers => ["89.16.162.20", "2001:41c9:2:d6::20"],
     :private_address => "10.0.16.100"
   }
 )
@@ -48,9 +54,5 @@ run_list(
   "role[bytemark]",
   "role[mail]",
   "role[lists]",
-  "role[subversion]",
-  "role[trac]",
-  "role[osqa]",
-  "role[irc]",
-  "recipe[blogs]"
+  "role[osqa]"
 )