From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 7 Aug 2018 08:12:31 +0000 (+0200)
Subject: get our ipv[46] ldap addresses
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=9c394a1e25602ff8a17048f2fd67ee19acf02cae;p=mirror%2Fdsa-puppet.git

get our ipv[46] ldap addresses
---

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index e74f78b67..872eeff87 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -49,6 +49,8 @@ module Puppet::Parser::Functions
         # 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? }
+        nodeinfo['misc']['v4_ldap'] = nodeinfo['ldap']['ipHostNumber'].select { |x| IPAddr.new(x).ipv4? }
+        nodeinfo['misc']['v6_ldap'] = nodeinfo['ldap']['ipHostNumber'].select { |x| IPAddr.new(x).ipv6? }
       end
 
       ns = call_function('hiera',['nameservers'])