Don't try and set the hostname when running tests

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

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 4e496439bf99642e7b295618e1e7825cc935a4e4..38c2156f2457d5544fc76588293dbc8e6f907542 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -177,8 +177,15 @@ package "cloud-init" do
   action :purge
 end
 
-hostname node[:networking][:hostname] do
-  ipaddress nil
+ohai "reload-hostname" do
+  action :nothing
+  plugin "hostname"
+end
+
+execute "hostnamectl-set-static" do
+  command "hostnamectl set-static #{node[:networking][:hostname]}"
+  notifies :reload, "ohai[reload-hostname]"
+  not_if { ENV.key?("TEST_KITCHEN") || node[:hostnamectl][:static_hostname] == node[:networking][:hostname] }
 end
 
 template "/etc/hosts" do