Upgrade chef client to 11.8.0

[chef.git] / cookbooks / sysctl / recipes / default.rb

diff --git a/cookbooks/sysctl/recipes/default.rb b/cookbooks/sysctl/recipes/default.rb
index 58e86f94c07613f6e620736cdd43a2304e978295..380e747b90610cf3443f93b2dc18e9ffd13e41ae 100644 (file)
--- a/cookbooks/sysctl/recipes/default.rb
+++ b/cookbooks/sysctl/recipes/default.rb
@@ -21,27 +21,19 @@ package "procps" do
   action :install
 end
 
-if node[:lsb][:release].to_f <= 8.04
-  sysctl_template = "sysctl.conf.erb"
-  sysctl_conf = "/etc/sysctl.conf"
-else
-  directory "/etc/sysctl.d" do
-    owner "root"
-    group "root"
-    mode 0755
-  end
-
-  sysctl_template = "chef.conf.erb"
-  sysctl_conf = "/etc/sysctl.d/60-chef.conf"
+directory "/etc/sysctl.d" do
+  owner "root"
+  group "root"
+  mode 0755
 end
 
 execute "sysctl" do
   action :nothing
-  command "/sbin/sysctl -p #{sysctl_conf}"
+  command "/sbin/sysctl -p /etc/sysctl.d/60-chef.conf"
 end
 
-template sysctl_conf do
-  source sysctl_template
+template "/etc/sysctl.d/60-chef.conf" do
+  source "chef.conf.erb"
   owner "root"
   group "root"
   mode 0644
@@ -54,6 +46,7 @@ node[:sysctl].each_value do |group|
 
     file sysctl_file do
       content "#{value}\n"
+      atomic_update false
       only_if { File.exists?(sysctl_file) }
     end
   end