X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/feb6a00ff7472578d07afc39fbc0eded52245727..59baf108f689be6bf6258f2acbf50c7ff41dc2ac:/roles/shenron.rb

diff --git a/roles/shenron.rb b/roles/shenron.rb
index c82e4cd21..b2277551f 100644
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -25,31 +25,26 @@ override_attributes(
   :networking => {
     :dnssec => "false",
     :interfaces => {
-      :external_ipv4 => {
+      :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 => ["89.16.162.20", "2001:41c9:2:d6::20"],
-    :private_address => "10.0.16.100"
+    }
   }
 )
 
 run_list(
   "role[bytemark]",
-  "role[mail]",
   "role[lists]",
   "role[osqa]"
 )