Add new Amsterdam IPv6 addresses to ACLs

[chef.git] / roles / lockheed.rb

diff --git a/roles/lockheed.rb b/roles/lockheed.rb
index 8f42973e6256375891cabb2d43c5a32de8d9e646..de012bb5300046bdc78d37c4dbea9cc8ccbf4b62 100644 (file)
--- a/roles/lockheed.rb
+++ b/roles/lockheed.rb
@@ -17,18 +17,62 @@ default_attributes(
           :slaves => %w[eno49 eno50]
         }
       },
-      :external => {
+      :external_he => {
         :interface => "bond0.3",
         :role => :external,
+        :metric => 150,
+        :source_route_table => 100,
         :inet => {
-          :address => "184.104.179.144"
-        },
-        :inet6 => {
-          :address => "2001:470:1:fa1::10"
+          :address => "184.104.179.144",
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        }
+      },
+      :external => {
+        :interface => "bond0.103",
+        :role => :external,
+        :source_route_table => 150,
+        :inet => {
+          :address => "82.199.86.112",
+          :prefix => "27",
+          :gateway => "82.199.86.97"
         }
       }
     }
   },
+  :sysctl => {
+    :sockets => {
+      :comment => "Increase size of connection queue",
+      :parameters => {
+        "net.core.somaxconn" => 10000
+      }
+    },
+    :network_conntrack_time_wait => {
+      :comment => "Only track completed connections for 30 seconds",
+      :parameters => {
+        "net.netfilter.nf_conntrack_tcp_timeout_time_wait" => "30"
+      }
+    },
+    :network_conntrack_max => {
+      :comment => "Increase max number of connections tracked",
+      :parameters => {
+        "net.netfilter.nf_conntrack_max" => "524288"
+      }
+    },
+    :no_tcp_slow_start => {
+      :comment => "Disable TCP slow start",
+      :parameters => {
+        "net.ipv4.tcp_slow_start_after_idle" => "0"
+      }
+    },
+    :tcp_use_bbr => {
+      :comment => "Use TCP BBR Congestion Control",
+      :parameters => {
+        "net.core.default_qdisc" => "fq",
+        "net.ipv4.tcp_congestion_control" => "bbr"
+      }
+    }
+  },
   :nginx => {
     :cache => {
       :proxy => {
@@ -44,6 +88,5 @@ default_attributes(
 run_list(
   "role[equinix-ams]",
   "role[hp-g9]",
-  "recipe[imagery::za_ngi_aerial]",
-  "recipe[imagery::us_imagery]"
+  "role[imagery]"
 )