Remove any sysctl settings which are no longer required

diff --git a/cookbooks/sysctl/recipes/default.rb b/cookbooks/sysctl/recipes/default.rb
index 8cc672eb84207f5ee6ae1e203b9a4a6150e82c6c..bf9860e0cf50bf7d08baec79736cf167af2e14b3 100644 (file)
--- a/cookbooks/sysctl/recipes/default.rb
+++ b/cookbooks/sysctl/recipes/default.rb
@@ -31,4 +31,12 @@ if node[:virtualization][:role] != "guest" ||
       end
     end
   end
       end
     end
   end

+
+  Dir.new("/etc/sysctl.d").each_entry do |file|
+    next unless file =~ /^99-chef-(.*)\.conf$/
+
+    sysctl Regexp.last_match(1) do
+      action :remove
+    end
+  end

 end
 end