From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 31 Jul 2018 08:22:15 +0000 (+0200)
Subject: Add has_v[46]_ldap key to nodeinfo['misc'] to say whether we have a v[46] address... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=inline;h=b4f2aa2de16b46711be5ca7d0cf82160db0222b8;p=mirror%2Fdsa-puppet.git

Add has_v[46]_ldap key to nodeinfo['misc'] to say whether we have a v[46] address in ldap
---

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'])