Merge remote-tracking branch 'github/pull/451'

[chef.git] / roles / bytemark.rb

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 375d7611dedd86df848ee2fa6d3b4ccedc51e114..93f652b1dc72a8d27bb8278fd844e76613d0b9d0 100644 (file)
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -2,20 +2,17 @@ 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 => {
@@ -32,7 +29,6 @@ default_attributes(
     }
   },
   :web => {
-    :backends => %w[rails4 rails5],
     :fileserver => "grisu",
     :readonly_database_host => "katla.bm.openstreetmap.org"
   }
@@ -40,6 +36,7 @@ default_attributes(
 
 override_attributes(
   :networking => {
+    :nameservers => ["10.0.32.20"],
     :search => ["bm.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {