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

[chef.git] / roles / bytemark.rb

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 93f652b1dc72a8d27bb8278fd844e76613d0b9d0..8a3e6e25637790d2a6855deabd7e7b99271f9037 100644 (file)
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -27,16 +27,12 @@ default_attributes(
         }
       }
     }
-  },
-  :web => {
-    :fileserver => "grisu",
-    :readonly_database_host => "katla.bm.openstreetmap.org"
   }
 )
 
 override_attributes(
   :networking => {
-    :nameservers => ["10.0.32.20"],
+    :nameservers => ["8.8.8.8", "8.8.4.4"],
     :search => ["bm.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {