]> git.openstreetmap.org Git - chef.git/commitdiff
Attempt to fix test failures caused by crazy docker networking
authorTom Hughes <tom@compton.nu>
Fri, 18 Sep 2020 21:55:31 +0000 (22:55 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 18 Sep 2020 21:55:31 +0000 (22:55 +0100)
cookbooks/networking/recipes/default.rb

index 0989d8d11bdcadfed3cd61e8f61ebcae0a7a1aa2..fa3f97d00f6a6230416101d88a0f230c3c1119d6 100644 (file)
@@ -342,15 +342,9 @@ template "/etc/systemd/resolved.conf.d/99-chef.conf" do
   notifies :restart, "service[systemd-resolved]", :immediately
 end
 
-if node[:filesystem][:by_mountpoint][:"/etc/resolv.conf"]
-  mount "/etc/resolv.conf" do
-    action :umount
-    device node[:filesystem][:by_mountpoint][:"/etc/resolv.conf"][:devices].first
-  end
-end
-
 link "/etc/resolv.conf" do
   to "../run/systemd/resolve/stub-resolv.conf"
+  not_if { ENV["TEST_KITCHEN"] }
 end
 
 zones = {}