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 89e8198e223ba0545b479afaa87d50ec440666d6..321109a1de0d04127c0ee4a0ecb90784f5552768 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -177,18 +177,7 @@ 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"