projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
baeh puppet
[mirror/dsa-puppet.git]
/
modules
/
puppetmaster
/
lib
/
puppet
/
parser
/
functions
/
nodeinfo.rb
diff --git
a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index
fd61919
..
d77d65c
100644
(file)
--- 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')
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
nodeinfo['misc']['v4addrs'] = v4ips.split(',')
# find out if we are behind nat
@@
-34,7
+34,7
@@
module Puppet::Parser::Functions
end
v6ips = lookupvar('::v6ips')
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
nodeinfo['misc']['v6addrs'] = v6ips.split(',')
end
end