Use he.net resolvers in Amsterdam and Dublin

[chef.git] / roles / scorch.rb

diff --git a/roles/scorch.rb b/roles/scorch.rb
index 36b8e4450dd79515b7610933080393a98d34f8d2..0649374f4980841f4ce9f4525c5350d850f406b9 100644 (file)
--- a/roles/scorch.rb
+++ b/roles/scorch.rb
@@ -15,28 +15,21 @@ default_attributes(
       }
     }
   },
-  :hardware => {
-    :mcelog => {
-      :enabled => false
-    }
-  },
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
-        :interface => "eth0",
-        :role => :external,
-        :family => :inet,
-        :address => "176.31.235.79",
-        :prefix => "24",
-        :gateway => "176.31.235.254"
-      },
-      :external_ipv6 => {
+      :external => {
         :interface => "eth0",
         :role => :external,
-        :family => :inet6,
-        :address => "2001:41d0:2:fc4f::1",
-        :prefix => "64",
-        :gateway => "2001:41d0:2:fcff:ff:ff:ff:ff"
+        :inet => {
+          :address => "176.31.235.79",
+          :prefix => "24",
+          :gateway => "176.31.235.254"
+        },
+        :inet6 => {
+          :address => "2001:41d0:2:fc4f::1",
+          :prefix => "64",
+          :gateway => "2001:41d0:2:fcff:ff:ff:ff:ff"
+        }
       }
     }
   }