X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Finit.pp;h=e23e15d964e87cbd091369fe03df33232aed248a;hb=ce8ff5e8ef54888f2b4d60b45cb85377ba59eb56;hp=9290d35c0452d771e7d6041ed08caf9c11e795a9;hpb=f2c3ac3b6d62f9e0d049e370aa031daea503b7c7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 9290d35c0..e23e15d96 100644
--- 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,