Stop hard coding host list for debian_mirror and use the same code we use for security

diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index cde0992..cdd2de9 100644 (file)
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -37,10 +37,12 @@ class roles::debian_mirror {
                }
        }
 
-#      $mirrors = hiera_hash('roles::debian_mirror',[])
-#      $fastly_mirrors = $mirrors.filter |$h| { $h[1]['fastly-backend'] }
-#      $hosts_to_check = $fastly_mirrors.map | $h| { $h1['service-hostname'] }
-       $hosts_to_check = ['accumu.debian.backend.mirrors.debian.org', 'bytemark.debian.backend.mirrors.debian.org', 'conova.debian.backend.mirrors.debian.org', 'skroutz.debian.backend.mirrors.debian.org']
+        # roles is a list of hashes, which needs to be unpacked into a regular hash
+        $mirrors = hiera('roles.debian_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 { 'ftp':
                check_hosts   => $hosts_to_check,