Fix en.openstreetmap.town container

[chef.git] / roles / shenron.rb

diff --git a/roles/shenron.rb b/roles/shenron.rb
index ee89e0a35d5b1493bb7a5ba3d921bbc8a1d4cfc2..f916772268737add51adcddb0c0d2d414bd437d1 100644 (file)
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -10,47 +10,46 @@ default_attributes(
     }
   },
   :hardware => {
     }
   },
   :hardware => {

-    :mcelog => {
-      :enabled => false
+    :hwmon => {
+      "platform_it87_552" => {
+        :ignore => %w[in6]
+      }

     },
     :modules => [
       "it87"
     ]
     },
     :modules => [
       "it87"
     ]

+  },
+  :prometheus => {
+    :metrics => {
+      :exim_queue_limit => { :metric => 250 }
+    }

   }
 )
 
 override_attributes(
   :networking => {
   }
 )
 
 override_attributes(
   :networking => {

+    :dnssec => "false",

     :interfaces => {
     :interfaces => {

-      :external_ipv4 => {
+      :external => {

         :interface => "eth0",
         :role => :external,
         :interface => "eth0",
         :role => :external,

-        :family => :inet,
-        :address => "212.110.172.32",
-        :prefix => "26",
-        :gateway => "212.110.172.1"
-      },
-      :external_ipv6 => {
-        :interface => "eth0",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:41c9:1:400::32",
-        :prefix => "64",
-        :gateway => "fe80::1"
+        :inet => {
+          :address => "212.110.172.32",
+          :prefix => "26",
+          :gateway => "212.110.172.1"
+        },
+        :inet6 => {
+          :address => "2001:41c9:1:400::32",
+          :prefix => "64",
+          :gateway => "fe80::1"
+        }

       }
       }

-    },
-    :nameservers => ["8.8.8.8", "8.8.4.4"],
-    :private_address => "10.0.16.100"
+    }

   }
 )
 
 run_list(
   "role[bytemark]",
   }
 )
 
 run_list(
   "role[bytemark]",

-  "role[mail]",

   "role[lists]",
   "role[lists]",

-  "role[subversion]",
-  "role[trac]",
-  "role[osqa]",
-  "role[irc]",
-  "recipe[blogs]"
+  "role[osqa]"

 )
 )