X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fnodeinfo.rb;h=d77d65c88dd66de2ca34df4afe1f004e4a27ba17;hb=b97f50b20f35f7f736d6c6a9ec80a98e1cf9dcb8;hp=fd61919ed5f5d6d21d6f0dd2f2db0b905647e5fe;hpb=39a6242f65a01a1fb9693278be69b12460ac015f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index fd61919ed..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
@@ -34,7 +34,7 @@ module Puppet::Parser::Functions
         end
 
         v6ips = lookupvar('::v6ips')
-        if v6ips and v6ips != ""
+        if v6ips and v6ips.to_s != "" and v6ips.to_s != 'undefined'
           nodeinfo['misc']['v6addrs'] = v6ips.split(',')
         end
       end