Don't try and configure sysctl of sysfs on lxd containers

diff --git a/cookbooks/sysctl/recipes/default.rb b/cookbooks/sysctl/recipes/default.rb
index adf43e55c9a4448c9697a3ca6cfda7a9eb15a018..b65b12a21b36d5ef9e1cb991b4630e4e53a4ac22 100644 (file)
--- a/cookbooks/sysctl/recipes/default.rb
+++ b/cookbooks/sysctl/recipes/default.rb
@@ -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

diff --git a/cookbooks/sysfs/recipes/default.rb b/cookbooks/sysfs/recipes/default.rb
index d046b1f3684789b6752ff51694edcb4b21bd63d3..9b08c44cf6fbeadde1b56cf380fc2aaf112afa88 100644 (file)
--- a/cookbooks/sysfs/recipes/default.rb
+++ b/cookbooks/sysfs/recipes/default.rb
@@ -17,30 +17,36 @@
 # limitations under the License.
 #
 
-package "sysfsutils"
+if node[:virtualization][:role] == "guest" &&
+   node[:virtualization][:system] == "lxd"
+  package "sysfsutils" do
+    action :purge
+  end
+else
+  package "sysfsutils"
 
-service "sysfsutils" do
-  action :enable
-  supports :status => false, :restart => true, :reload => false
-end
+  service "sysfsutils" do
+    action :enable
+    supports :status => false, :restart => true, :reload => false
+  end
 
-template "/etc/sysfs.conf" do
-  source "sysfs.conf.erb"
-  owner "root"
-  group "root"
-  mode 0o644
-  notifies :restart, "service[sysfsutils]"
-end
+  template "/etc/sysfs.conf" do
+    source "sysfs.conf.erb"
+    owner "root"
+    group "root"
+    mode 0o644
+    notifies :restart, "service[sysfsutils]"
+  end
 
-node[:sysfs].each_value do |group|
-  group[:parameters].each do |key, value|
-    sysfs_file = "/sys/#{key}"
+  node[:sysfs].each_value do |group|
+    group[:parameters].each do |key, value|
+      sysfs_file = "/sys/#{key}"
 
-    file sysfs_file do
-      content "#{value}\n"
-      atomic_update false
-      ignore_failure true
-      only_if { File.exist?(sysfs_file) }
+      file sysfs_file do
+        content "#{value}\n"
+        atomic_update false
+        ignore_failure true
+      end
     end
   end
 end