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

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index ba0a322c4..472a1458e 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -36,12 +36,12 @@ class roles::security_mirror {
 		content => template('roles/security_mirror/security.debian.org.erb')
 	}
 
-	$mirrors = hiera_hash('roles::security_mirror',[])
-	notify { "Mirrors: ${mirrors}": }
-	$fastly_mirrors = $mirrors.filter |$h| { $h[1]['fastly-backend'] }
-	notify { "Fastly Mirrors: ${fastly_mirrors}": }
-	$hosts_to_check = $fastly_mirrors.map |$h| { $h[1]['service-hostname'] }
-	notify {"Fastly Mirrors: ${hosts_to_check}": }
+        # 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,