Ignore failure changing sysctl values

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

diff --git a/cookbooks/sysctl/recipes/default.rb b/cookbooks/sysctl/recipes/default.rb
index 58e86f94c07613f6e620736cdd43a2304e978295..adf43e55c9a4448c9697a3ca6cfda7a9eb15a018 100644 (file)
--- a/cookbooks/sysctl/recipes/default.rb
+++ b/cookbooks/sysctl/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,44 +17,36 @@
 # limitations under the License.
 #
 
-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
+package "procps"
 
-  sysctl_template = "chef.conf.erb"
-  sysctl_conf = "/etc/sysctl.d/60-chef.conf"
+directory "/etc/sysctl.d" do
+  owner "root"
+  group "root"
+  mode 0o755
 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
-  notifies :run, resources(:execute => "sysctl")
+  mode 0o644
+  notifies :run, "execute[sysctl]"
 end
 
 node[:sysctl].each_value do |group|
-  group[:parameters].each do |key,value|
-    sysctl_file = "/proc/sys/#{key.gsub('.', '/')}"
+  group[:parameters].each do |key, value|
+    sysctl_file = "/proc/sys/#{key.tr('.', '/')}"
 
     file sysctl_file do
       content "#{value}\n"
-      only_if { File.exists?(sysctl_file) }
+      atomic_update false
+      ignore_failure true
+      only_if { File.exist?(sysctl_file) }
     end
   end
 end