From b4f2aa2de16b46711be5ca7d0cf82160db0222b8 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 31 Jul 2018 10:22:15 +0200 Subject: [PATCH] Add has_v[46]_ldap key to nodeinfo['misc'] to say whether we have a v[46] address in ldap --- .../puppetmaster/lib/puppet/parser/functions/nodeinfo.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb index 812ff0c9c..e74f78b67 100644 --- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb +++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb @@ -1,5 +1,7 @@ module Puppet::Parser::Functions newfunction(:nodeinfo, :type => :rvalue) do |args| + require 'ipaddr' + host = args[0] yamlfile = args[1] begin @@ -43,6 +45,10 @@ module Puppet::Parser::Functions else nodeinfo['misc']['v6addrs'] = [] end + + # find out if we have an ipv4 and/or an ipv6 address for our host in ldap. + nodeinfo['misc']['has_v4_ldap'] = nodeinfo['ldap']['ipHostNumber'].any? { |x| IPAddr.new(x).ipv4? } + nodeinfo['misc']['has_v6_ldap'] = nodeinfo['ldap']['ipHostNumber'].any? { |x| IPAddr.new(x).ipv6? } end ns = call_function('hiera',['nameservers']) -- 2.20.1