Make configuration of hostname work properly

[chef.git] / cookbooks / networking / recipes / default.rb

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 6031ef508f6ed1a842bebe0e9782580bfe742493..321109a1de0d04127c0ee4a0ecb90784f5552768 100644 (file)
--- 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
@@ -215,10 +205,10 @@ 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"]
+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
+    device node[:filesystem][:by_mountpoint][:"/etc/resolv.conf"][:devices].first
   end
 end