From: Tom Hughes <tom@compton.nu>
Date: Mon, 20 May 2019 07:40:56 +0000 (+0100)
Subject: Attempt to override the FQDN on fume
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/0d3914cdadb7d61b06c5553f6a1d2937a23820a4?hp=0dd6648dccbe588d9160e8f54ec05036c0d0bef8

Attempt to override the FQDN on fume
---

diff --git a/cookbooks/chef/templates/default/client.rb.erb b/cookbooks/chef/templates/default/client.rb.erb
index 2af462bf9..5d1f46393 100644
--- a/cookbooks/chef/templates/default/client.rb.erb
+++ b/cookbooks/chef/templates/default/client.rb.erb
@@ -17,6 +17,10 @@ log_level :info
 
 log_location "/var/log/chef/client.log"
 
+# Set the node name
+
+node_name "<%= node.name %>"
+
 # Verify SSL certificates
 
 ssl_verify_mode :verify_peer
diff --git a/cookbooks/networking/templates/default/hostname.erb b/cookbooks/networking/templates/default/hostname.erb
index 1e80c0c06..9842667e9 100644
--- a/cookbooks/networking/templates/default/hostname.erb
+++ b/cookbooks/networking/templates/default/hostname.erb
@@ -1 +1 @@
-<%= node[:hostname] %>.openstreetmap.org
+<%= node[:fqdn] %>