Bump test-kitchen from 2.12.0 to 3.0.0

[chef.git] / roles / bytemark.rb

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 9f1b4e9bfd1ee87b49fde5d3e94bd6cf78141cb2..7b06247525ba718d57c0445ac17943cf50424e21 100644 (file)
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -5,12 +5,14 @@ default_attributes(
   :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 => {
@@ -29,12 +31,13 @@ default_attributes(
   :web => {
     :backends => %w[rails4 rails5],
     :fileserver => "grisu",
-    :readonly_database_host => "eddie.bm.openstreetmap.org"
+    :readonly_database_host => "katla.bm.openstreetmap.org"
   }
 )
 
 override_attributes(
   :networking => {
+    :nameservers => ["10.0.32.20"],
     :search => ["bm.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {