X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f6cb433b825720b178c1452fe7b829437a11fa8c..38242c2ddcec93702f548cc9f682a6db22880f6c:/cookbooks/networking/recipes/default.rb

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index bd8517087..321109a1d 100644
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -177,24 +177,14 @@ package "cloud-init" do
   action :purge
 end
 
-execute "hostname" do
-  action :nothing
-  command "/bin/hostname -F /etc/hostname"
-end
-
-template "/etc/hostname" do
-  source "hostname.erb"
-  owner "root"
-  group "root"
-  mode 0o644
-  notifies :run, "execute[hostname]"
-end
+hostname node[:networking][:hostname]
 
 template "/etc/hosts" do
   source "hosts.erb"
   owner "root"
   group "root"
   mode 0o644
+  not_if { ENV["TEST_KITCHEN"] }
 end
 
 service "systemd-resolved" do
@@ -212,7 +202,18 @@ template "/etc/systemd/resolved.conf.d/99-chef.conf" do
   owner "root"
   group "root"
   mode 0o644
-  notifies :restart, "service[systemd-resolved]"
+  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"
 end
 
 if node[:networking][:tcp_fastopen_key]