diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-09-05 11:39:57 +1000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-09-05 11:42:16 +1000 |
| commit | 8fe033820875966106ab3807aa34a1cafc85cbd2 (patch) | |
| tree | d23ec6416dd6a16b2edd540092cb85aca1557754 | |
| parent | 81cc9bf4892170e2e36a7b0b302a74f88c6825d1 (diff) | |
| download | puppet-8fe033820875966106ab3807aa34a1cafc85cbd2.tar.gz puppet-8fe033820875966106ab3807aa34a1cafc85cbd2.tar.xz puppet-8fe033820875966106ab3807aa34a1cafc85cbd2.zip | |
Fixes #1554 - Fix exception for undefined hostname
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | lib/puppet/node.rb | 6 |
2 files changed, 6 insertions, 2 deletions
@@ -1,4 +1,6 @@ 0.24.x + Fixes #1554 - Fix exception for undefined hostname + Fixed #1533 - changed permissions for man directory Added daemontools and runit providers for service type diff --git a/lib/puppet/node.rb b/lib/puppet/node.rb index afa18f565..341ec77ba 100644 --- a/lib/puppet/node.rb +++ b/lib/puppet/node.rb @@ -94,8 +94,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 |