Remove code to set (now unused) tcp fastopen keys

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index a6fcaf80fc4cfd4fb283132fe9a22a32403d7614..4c0e047465fe81949bcd1d5070a8af2541282658 100644 (file)
--- 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
 
   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|
 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 4d79d848f59a4e457e0d264190d81420bf3344a6..a76af78a7f627b24e82597bc0d89ef14ed5d36b4 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -9,9 +9,6 @@ default_attributes(
       }
     }
   },
       }
     }
   },

-  :networking => {
-    :tcp_fastopen_key => "tile"
-  },

   :nginx => {
     :access_log => false
   },
   :nginx => {
     :access_log => false
   },

diff --git a/roles/web-frontend.rb b/roles/web-frontend.rb
index 0435872dd1c751b166465f04f34d76e702c9aa29..3ecca30ff085b385f7782e3be0dabf4b13b9fd81 100644 (file)
--- 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
   },
   :passenger => {
     :max_pool_size => 50
   },