From 6701c75cd26e603cafa373db9ee75e6c099639e9 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 18 Sep 2020 22:55:31 +0100 Subject: [PATCH] Attempt to fix test failures caused by crazy docker networking --- cookbooks/networking/recipes/default.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) 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 = {} -- 2.45.1