From 9b6fa6d1c1d425a8e1368ae1ec23bfdee308b169 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 21 Jul 2020 20:48:55 +0100 Subject: [PATCH] Remove code to set (now unused) tcp fastopen keys --- cookbooks/networking/recipes/default.rb | 11 ----------- roles/tilecache.rb | 3 --- roles/web-frontend.rb | 3 --- 3 files changed, 17 deletions(-) diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb index a6fcaf80f..4c0e04746 100644 --- a/cookbooks/networking/recipes/default.rb +++ b/cookbooks/networking/recipes/default.rb @@ -229,17 +229,6 @@ link "/etc/resolv.conf" do to "../run/systemd/resolve/stub-resolv.conf" end -if node[:networking][:tcp_fastopen_key] - fastopen_keys = data_bag_item("networking", "fastopen") - - node.normal[:sysctl][:tcp_fastopen] = { - :comment => "Set shared key for TCP fast open", - :parameters => { - "net.ipv4.tcp_fastopen_key" => fastopen_keys[node[:networking][:tcp_fastopen_key]] - } - } -end - node.interfaces(:role => :internal) do |interface| if interface[:gateway] && interface[:gateway] != interface[:address] search(:node, "networking_interfaces*address:#{interface[:gateway]}") do |gateway| diff --git a/roles/tilecache.rb b/roles/tilecache.rb index 4d79d848f..a76af78a7 100644 --- a/roles/tilecache.rb +++ b/roles/tilecache.rb @@ -9,9 +9,6 @@ default_attributes( } } }, - :networking => { - :tcp_fastopen_key => "tile" - }, :nginx => { :access_log => false }, diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb index 0435872dd..3ecca30ff 100644 --- a/roles/web-frontend.rb +++ b/roles/web-frontend.rb @@ -21,9 +21,6 @@ default_attributes( ] } }, - :networking => { - :tcp_fastopen_key => "www" - }, :passenger => { :max_pool_size => 50 }, -- 2.45.1