Workaround apparent bug in chef-client 16.5

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

diff --git a/cookbooks/sysctl/recipes/default.rb b/cookbooks/sysctl/recipes/default.rb
index 58e86f94c07613f6e620736cdd43a2304e978295..f16537c5185c277d12897f8424bf8b6cf58575d9 100644 (file)
--- a/cookbooks/sysctl/recipes/default.rb
+++ b/cookbooks/sysctl/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: sysctl
+# Cookbook:: sysctl

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2010, Tom Hughes
+# Copyright:: 2010, Tom Hughes

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # 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,
 #
 # 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.
 #
 
 # limitations under the License.
 #
 

-package "procps" do
-  action :install
+file "/etc/sysctl.d/60-chef.conf" do
+  action :delete

 end
 
 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
+if node[:virtualization][:role] != "guest" ||
+   (node[:virtualization][:system] != "lxc" &&
+    node[:virtualization][:system] != "lxd" &&
+    node[:virtualization][:system] != "openvz")
+  keys = []

 
 

-  sysctl_template = "chef.conf.erb"
-  sysctl_conf = "/etc/sysctl.d/60-chef.conf"
-end
+  Dir.new("/etc/sysctl.d").each_entry do |file|
+    next unless file =~ /^99-chef-(.*)\.conf$/

 
 

-execute "sysctl" do
-  action :nothing
-  command "/sbin/sysctl -p #{sysctl_conf}"
-end
+    keys.push(Regexp.last_match(1))
+  end

 
 

-template sysctl_conf do
-  source sysctl_template
-  owner "root"
-  group "root"
-  mode 0644
-  notifies :run, resources(:execute => "sysctl")
-end
+  node[:sysctl].each_value do |group|
+    group[:parameters].each do |key, value|
+      sysctl key do
+        value value
+        # comment group[:comment]
+      end

 
 

-node[:sysctl].each_value do |group|
-  group[:parameters].each do |key,value|
-    sysctl_file = "/proc/sys/#{key.gsub('.', '/')}"
+      keys.delete(key)
+    end
+  end

 
 

-    file sysctl_file do
-      content "#{value}\n"
-      only_if { File.exists?(sysctl_file) }
+  keys.each do |key|
+    sysctl key do
+      action :remove

     end
   end
 end
     end
   end
 end