From 0a5b5cce3089ae780a23c11849ef470f6df1567e Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Thu, 1 Feb 2018 20:25:00 +0100 Subject: [PATCH] Use hiera data for pulling health check data for security hosts --- hieradata/common.yaml | 6 ++++++ modules/roles/manifests/security_mirror.pp | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 1dbe0efb1..deeff3124 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -129,11 +129,17 @@ roles: - mirror-accumu.debian.org - mirror-skroutz.debian.org - lobos.debian.org + service-hostname: lobos.security.backend.mirrors.debian.org + fastly-backend: true - santoro.debian.org - setoguchi.debian.org - sechter.debian.org - villa.debian.org + service-hostname: villa.security.backend.mirrors.debian.org + fastly-backend: true - wieck.debian.org + service-hostname: wieck.security.backend.mirrors.debian.org + fastly-backend: true security_mirror_onion: - mirror-isc.debian.org - mirror-umn.debian.org diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp index 25af73c98..66201aa49 100644 --- a/modules/roles/manifests/security_mirror.pp +++ b/modules/roles/manifests/security_mirror.pp @@ -36,8 +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| { $h1['service-hostname'] } + roles::mirror_health { 'security': - check_hosts => hiera('roles.security_mirror'), + check_hosts => $hosts_to_check, check_service => 'security', url => 'http://security.backend.mirrors.debian.org/debian/dists/sid/Release', health_url => 'http://security.backend.mirrors.debian.org/_health', -- 2.20.1