From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 31 Oct 2018 08:41:50 +0000 (+0100)
Subject: unique all ip addresses
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=30be0f0db19c688a30cc568c80be00a6724bd1e2;p=mirror%2Fdsa-puppet.git

unique all ip addresses
---

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index c4c906db6..f33c8ba8d 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -7,8 +7,6 @@
 #   include ferm
 #
 class ferm {
-	include stdlib
-
 	# realize (i.e. enable) all @ferm::rule virtual resources
 	Ferm::Rule <| |>
 	Ferm::Conf <| |>
@@ -31,7 +29,7 @@ class ferm {
 		status      => '/bin/true',
 	}
 
-	$munin_ips = unique(getfromhash($site::nodeinfo, 'misc', 'v4addrs'))
+	$munin_ips = getfromhash($site::nodeinfo, 'misc', 'v4addrs')
 		.map |$addr| { "ip_${addr}" }
 
 	munin::check { $munin_ips: script => 'ip_', }
diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index 872eeff87..3bfaa5c27 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -30,7 +30,7 @@ module Puppet::Parser::Functions
       if fqdn and fqdn == host
         v4ips = lookupvar('::v4ips')
         if v4ips and v4ips.to_s != "" and v4ips.to_s != 'undefined'
-          nodeinfo['misc']['v4addrs'] = v4ips.split(',')
+          nodeinfo['misc']['v4addrs'] = v4ips.split(',').uniq()
 
           # find out if we are behind nat
           intersection = nodeinfo['misc']['v4addrs'] & nodeinfo['ldap']['ipHostNumber']
@@ -41,7 +41,7 @@ module Puppet::Parser::Functions
 
         v6ips = lookupvar('::v6ips')
         if v6ips and v6ips.to_s != "" and v6ips.to_s != 'undefined'
-          nodeinfo['misc']['v6addrs'] = v6ips.split(',')
+          nodeinfo['misc']['v6addrs'] = v6ips.split(',').uniq()
         else
           nodeinfo['misc']['v6addrs'] = []
         end