From: Tom Hughes <tom@compton.nu>
Date: Fri, 18 Sep 2020 21:55:31 +0000 (+0100)
Subject: Attempt to fix test failures caused by crazy docker networking
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/6701c75cd26e603cafa373db9ee75e6c099639e9

Attempt to fix test failures caused by crazy docker networking
---

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 0989d8d11..fa3f97d00 100644
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -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 = {}