more

[mirror/dsa-puppet.git] / modules / ferm / manifests / init.pp

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 9290d35..e23e15d 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -29,18 +29,14 @@ class ferm {
                status      => '/bin/true',
        }
 
-       $munin_ips = split(regsubst($::v4ips, '([^,]+)', 'ip_\1', 'G'), ',')
+       $munin_ips = getfromhash($site::nodeinfo, 'misc', 'v4addrs')
+               .map |$addr| { "ip_${addr}" }
 
        munin::check { $munin_ips: script => 'ip_', }
 
-       if $v6ips {
-               $munin6_ips = split(regsubst($::v6ips, '([^,]+)', 'ip_\1', 'G'), ',')
-               munin::ipv6check { $munin6_ips: }
-       }
-
-       # get rid of old stuff
-       $munin6_ip6s = split(regsubst($::v6ips, '([^,]+)', 'ip6_\1', 'G'), ',')
-       munin::check { $munin6_ip6s: ensure => absent }
+       $munin6_ips = getfromhash($site::nodeinfo, 'misc', 'v6addrs')
+               .map |$addr| { "ip_${addr}" }
+       munin::ipv6check { $munin6_ips: }
 
        file { '/etc/ferm':
                ensure  => directory,