X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3a73476b53d7bfbab341d51fd88ff513ef4c24ce..709c582dd58742d3a1ba083f9105efdb17a5de6e:/cookbooks/sysctl/recipes/default.rb

diff --git a/cookbooks/sysctl/recipes/default.rb b/cookbooks/sysctl/recipes/default.rb
index adf43e55c..14295b377 100644
--- a/cookbooks/sysctl/recipes/default.rb
+++ b/cookbooks/sysctl/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: sysctl
+# Cookbook:: sysctl
 # 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.
@@ -17,36 +17,42 @@
 # limitations under the License.
 #
 
-package "procps"
+if node[:virtualization][:role] == "guest" &&
+   node[:virtualization][:system] == "lxd"
+  file "/etc/sysctl.d/60-chef.conf" do
+    action :delete
+  end
+else
+  package "procps"
 
-directory "/etc/sysctl.d" do
-  owner "root"
-  group "root"
-  mode 0o755
-end
+  directory "/etc/sysctl.d" do
+    owner "root"
+    group "root"
+    mode 0o755
+  end
 
-execute "sysctl" do
-  action :nothing
-  command "/sbin/sysctl -p /etc/sysctl.d/60-chef.conf"
-end
+  execute "sysctl" do
+    action :nothing
+    command "/sbin/sysctl -p /etc/sysctl.d/60-chef.conf"
+  end
 
-template "/etc/sysctl.d/60-chef.conf" do
-  source "chef.conf.erb"
-  owner "root"
-  group "root"
-  mode 0o644
-  notifies :run, "execute[sysctl]"
-end
+  template "/etc/sysctl.d/60-chef.conf" do
+    source "chef.conf.erb"
+    owner "root"
+    group "root"
+    mode 0o644
+    notifies :run, "execute[sysctl]"
+  end
 
-node[:sysctl].each_value do |group|
-  group[:parameters].each do |key, value|
-    sysctl_file = "/proc/sys/#{key.tr('.', '/')}"
+  node[:sysctl].each_value do |group|
+    group[:parameters].each do |key, value|
+      sysctl_file = "/proc/sys/#{key.tr('.', '/')}"
 
-    file sysctl_file do
-      content "#{value}\n"
-      atomic_update false
-      ignore_failure true
-      only_if { File.exist?(sysctl_file) }
+      file sysctl_file do
+        content "#{value}\n"
+        atomic_update false
+        ignore_failure true
+      end
     end
   end
 end