unique all ip addresses

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index c4c906d..f33c8ba 100644 (file)
--- 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 872eeff..3bfaa5c 100644 (file)
--- 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