Add support to hashes for has_role

[mirror/dsa-puppet.git] / modules / roles / manifests / debian_mirror.pp

diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index 63385d8..302c5d8 100644 (file)
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -3,15 +3,14 @@ class roles::debian_mirror {
 
        $mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix')
        $archive_root = "${mirror_basedir_prefix}debian"
+       $listen_addresses = Hash(hiera('roles.debian_mirror').map |$h| {
+               $h.map |$k, $v| { [$k,$v] }[0]
+       }).dig($::fqdn, 'listen-addresses')
+               .then |$a| { $a + [ '127.0.0.1:80', '[::1]:80' ] }
+               .lest || { ['*:80'] }
 
        $vhost_listen = join([
-               $::hostname ? {
-                       klecker    => '130.89.148.12:80 127.0.0.1:80 [2001:610:1908:b000::148:12]:80 [2001:67c:2564:a119::148:12]:80 [::1]:80',
-                       mirror-bytemark => '5.153.231.45:80 127.0.0.1:80 [2001:41c8:1000:21::21:45]:80 [::1]:80',
-                       mirror-isc => '149.20.4.15:80 127.0.0.1:80 [2001:4f8:1:c::15]:80 [::1]:80',
-                       mirror-conova => '217.196.149.232:80 127.0.0.1:80 [2a02:16a8:dc41:100::232]:80 [::1]:80',
-                       default => '*:80',
-               },
+               *$listen_addresses,
                has_role('bgp') ? {
                        true => '193.31.7.2:80 [2a02:158:ffff:deb::2]:80',
                        default => '',
@@ -40,9 +39,17 @@ class roles::debian_mirror {
                }
        }
 
-        roles::mirror_health { 'ftp':
-               check_hosts   => ['accumu.debian.backend.mirrors.debian.org', 'bytemark.debian.backend.mirrors.debian.org', 'conova.debian.backend.mirrors.debian.org', 'klecker.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,
                check_service => 'ftp',
                url           => 'http://debian.backend.mirrors.debian.org/debian/dists/sid/Release',
-        }
+               health_url    => 'http://debian.backend.mirrors.debian.org/_health',
+       }
 }