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

[chef.git] / roles / equinix-dub.rb

diff --git a/roles/equinix-dub.rb b/roles/equinix-dub.rb
index 8a9189266940358030fd66906b4184f494c778c5..fd2a404302211f0e68b3bd2f331dc4ae15cea0fd 100644 (file)
--- a/roles/equinix-dub.rb
+++ b/roles/equinix-dub.rb
@@ -2,6 +2,15 @@ name "equinix-dub"
 description "Role applied to all servers at Equinix Dublin"
 
 default_attributes(
+  :sysctl => {
+    :enable_bbr_10g => {
+      :comment => "Enable BBR. Equinix Dub has 10G uplink unlikely to buffer overrun",
+      :parameters => {
+        "net.ipv4.tcp_congestion_control" => "bbr",
+        "net.ipv4.tcp_notsent_lowat" => "16384"
+      }
+    }
+  },
   :networking => {
     :roles => {
       :internal => {
@@ -21,23 +30,20 @@ default_attributes(
         },
         :inet6 => {
           :prefix => "64",
-          :gateway => "2001:470:1:b3b::1",
-          :routes => {
-            "2001:978:2:2c::/64" => { :type => "unreachable" }
-          }
+          :gateway => "2001:470:1:b3b::1"
         }
       }
     }
   },
   :web => {
     :fileserver => "fafnir",
-    :readonly_database_host => "snap-02.ucl.openstreetmap.org"
+    :readonly_database_host => "snap-03.dub.openstreetmap.org"
   }
 )
 
 override_attributes(
   :networking => {
-    :nameservers => ["10.0.64.2", "1.1.1.1", "1.0.0.1"],
+    :nameservers => ["10.0.64.2", "8.8.8.8", "8.8.4.4"],
     :search => ["dub.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {