summaryrefslogtreecommitdiff
path: root/lib/chef/knife
diff options
context:
space:
mode:
Diffstat (limited to 'lib/chef/knife')
-rw-r--r--lib/chef/knife/configure.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/knife/configure.rb b/lib/chef/knife/configure.rb
index 2c77bf101d..8bb8930aee 100644
--- a/lib/chef/knife/configure.rb
+++ b/lib/chef/knife/configure.rb
@@ -156,7 +156,7 @@ EOH
o.load_plugins
o.require_plugin 'os'
o.require_plugin 'hostname'
- o[:fqdn] || 'localhost'
+ o[:fqdn] || o[:machinename] || o[:hostname] || 'localhost'
end
def config_file