From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 30 Jun 2012 10:56:32 +0000 (+0200)
Subject: baeh puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b97f50b20f35f7f736d6c6a9ec80a98e1cf9dcb8;p=mirror%2Fdsa-puppet.git

baeh puppet
---

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index 47251c0a3..d77d65c88 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -25,7 +25,7 @@ module Puppet::Parser::Functions
       fqdn = lookupvar('::fqdn')
       if fqdn and fqdn == host
         v4ips = lookupvar('::v4ips')
-        if v4ips
+        if v4ips and v4ips.to_s != "" and v4ips.to_s != 'undefined'
           nodeinfo['misc']['v4addrs'] = v4ips.split(',')
 
           # find out if we are behind nat