X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_mirror.pp;h=472a1458edbf324e49a8767b52622e17f0646b53;hb=da4d916ea39b5fa0115af28af54d379e7f859059;hp=4482ddbf6e17d03280f1f4d4f811f95c72f858f5;hpb=bb10b90a62af434e61a11649800c0fa513a1b632;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 4482ddbf6..472a1458e 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -36,9 +36,12 @@ class roles::security_mirror {
 		content => template('roles/security_mirror/security.debian.org.erb')
 	}
 
-	$mirrors = hiera_hash('roles::security_mirror',[])
-	$fastly_mirrors = $mirrors.filter |$h| { $h[1]['fastly-backend'] }
-	$hosts_to_check = $fastly_mirrors.map | $h| { $h['service-hostname'] }
+        # roles is a list of hashes, which needs to be unpacked into a regular hash
+        $mirrors = hiera('roles.security_mirror', [])
+        # unpack $mirrors and construct a hash
+        $m2 = Hash($mirrors.map |$h| { $h.map |$k, $v| { [$k, $v] }[0]})
+        $fastly_mirrors = $m2.filter |$h| { $h[1]['fastly-backend'] }
+        $hosts_to_check = $fastly_mirrors.map |$h| { $h[1]['service-hostname'] }
 
         roles::mirror_health { 'security':
 		check_hosts   => $hosts_to_check,