diff options
Diffstat (limited to 'lib/puppet/node.rb')
| -rw-r--r-- | lib/puppet/node.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/puppet/node.rb b/lib/puppet/node.rb index 3322a9ee7..77f1f0780 100644 --- a/lib/puppet/node.rb +++ b/lib/puppet/node.rb @@ -96,8 +96,10 @@ class Puppet::Node # First, get the fqdn unless fqdn = parameters["fqdn"] - if domain = parameters["domain"] - fqdn = parameters["hostname"] + "." + parameters["domain"] + if parameters["hostname"] and parameters["domain"] + fqdn = parameters["hostname"] + "." + parameters["domain"] + else + Puppet.warning "Host is missing hostname and/or domain: %s" % name end end |