Drop last remnants of old bytemark networking

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 8f23bd5d02a806ddcb5d0a385d64a48fdeffb7f6..109a172088078aa239fee9c9193aee07747166c4 100644 (file)
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -3,30 +3,7 @@ description "Role applied to all servers at Bytemark"
 
 default_attributes(
   :hosted_by => "Bytemark",
-  :location => "York, England",
-  :networking => {
-    :roles => {
-      :internal => {
-        :inet => {
-          :prefix => "20",
-          :gateway => "10.0.32.20",
-          :routes => {
-            "10.0.0.0/8" => { :via => "10.0.32.20" }
-          }
-        }
-      },
-      :external => {
-        :inet => {
-          :prefix => "28",
-          :gateway => "89.16.162.17"
-        },
-        :inet6 => {
-          :prefix => "64",
-          :gateway => "fe80::1"
-        }
-      }
-    }
-  }
+  :location => "York, England"
 )
 
 override_attributes(

diff --git a/roles/shenron.rb b/roles/shenron.rb
index f916772268737add51adcddb0c0d2d414bd437d1..7f9f36a1cb78c588687a0cd2e34e373badb93075 100644 (file)
--- a/roles/shenron.rb
+++ b/roles/shenron.rb
@@ -19,14 +19,6 @@ default_attributes(
       "it87"
     ]
   },
-  :prometheus => {
-    :metrics => {
-      :exim_queue_limit => { :metric => 250 }
-    }
-  }
-)
-
-override_attributes(
   :networking => {
     :dnssec => "false",
     :interfaces => {
@@ -45,6 +37,11 @@ override_attributes(
         }
       }
     }
+  },
+  :prometheus => {
+    :metrics => {
+      :exim_queue_limit => { :metric => 250 }
+    }
   }
 )