X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/19292cce10ddff756c298142883712568c19bee3..d16f3d1a7f01a40ad821948956a21d26fdcab32b:/roles/bytemark.rb?ds=sidebyside

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 375d7611d..8f23bd5d0 100644
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -2,24 +2,20 @@ name "bytemark"
 description "Role applied to all servers at Bytemark"
 
 default_attributes(
-  :chef => {
-    :client => {
-      :version => "13.6.4"
-    }
-  },
   :hosted_by => "Bytemark",
   :location => "York, England",
   :networking => {
-    :nameservers => ["80.68.80.24", "80.68.80.25", "2001:41c8:2::1", "2001:41c8:2::2"],
     :roles => {
       :internal => {
         :inet => {
           :prefix => "20",
-          :gateway => "10.0.32.20"
+          :gateway => "10.0.32.20",
+          :routes => {
+            "10.0.0.0/8" => { :via => "10.0.32.20" }
+          }
         }
       },
       :external => {
-        :zone => "bm",
         :inet => {
           :prefix => "28",
           :gateway => "89.16.162.17"
@@ -30,16 +26,12 @@ default_attributes(
         }
       }
     }
-  },
-  :web => {
-    :backends => %w[rails4 rails5],
-    :fileserver => "grisu",
-    :readonly_database_host => "katla.bm.openstreetmap.org"
   }
 )
 
 override_attributes(
   :networking => {
+    :nameservers => ["8.8.8.8", "8.8.4.4"],
     :search => ["bm.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {