From: Tollef Fog Heen <tfheen@err.no>
Date: Fri, 2 Feb 2018 10:01:55 +0000 (+0100)
Subject: Move debian_mirror over to being a hash
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=271ad0ce3540fdd25fd99d411fc6a74cae6cea41;p=mirror%2Fdsa-puppet.git

Move debian_mirror over to being a hash
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index cc796a3c8..311cefc5f 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -254,35 +254,35 @@ roles:
   sreview.debian.org:
     - vittoria.debian.org
   debian_mirror:
-    - klecker.debian.org:
-        listen-addresses:
-          - '130.89.148.12:80'
-          - '[2001:610:1908:b000::148:12]:80'
-          - '[2001:67c:2564:a119::148:12]:80'
-        fastly-backend: false
-    - mirror-bytemark.debian.org:
-        service-hostname: bytemark.debian.backend.mirrors.debian.org
-        listen-addresses:
-          - '5.153.231.45:80'
-          - '[2001:41c8:1000:21::21:45]:80'
-        fastly-backend: true
-    - mirror-accumu.debian.org:
-        service-hostname: accumu.debian.backend.mirrors.debian.org
-        fastly-backend: true
-    - mirror-skroutz.debian.org:
-        service-hostname: skroutz.debian.backend.mirrors.debian.org
-        fastly-backend: true
-    - mirror-conova.debian.org:
-        service-hostname: conova.debian.backend.mirrors.debian.org
-        listen-addresses:
-          - '217.196.149.232:80'
-          - '[2a02:16a8:dc41:100::232]:80'
-        fastly-backend: true
-    - mirror-isc.debian.org:
-        listen-addresses:
-          - '149.20.4.15:80'
-          - '[2001:4f8:1:c::15]:80'
-        fastly-backend: false
+    klecker.debian.org:
+      listen-addresses:
+        - '130.89.148.12:80'
+        - '[2001:610:1908:b000::148:12]:80'
+        - '[2001:67c:2564:a119::148:12]:80'
+      fastly-backend: false
+    mirror-bytemark.debian.org:
+      service-hostname: bytemark.debian.backend.mirrors.debian.org
+      listen-addresses:
+        - '5.153.231.45:80'
+        - '[2001:41c8:1000:21::21:45]:80'
+      fastly-backend: true
+    mirror-accumu.debian.org:
+      service-hostname: accumu.debian.backend.mirrors.debian.org
+      fastly-backend: true
+    mirror-skroutz.debian.org:
+      service-hostname: skroutz.debian.backend.mirrors.debian.org
+      fastly-backend: true
+    mirror-conova.debian.org:
+      service-hostname: conova.debian.backend.mirrors.debian.org
+      listen-addresses:
+        - '217.196.149.232:80'
+        - '[2a02:16a8:dc41:100::232]:80'
+      fastly-backend: true
+    mirror-isc.debian.org:
+      listen-addresses:
+        - '149.20.4.15:80'
+        - '[2001:4f8:1:c::15]:80'
+      fastly-backend: false
   debian_mirror_onion:
     - klecker.debian.org
     - mirror-bytemark.debian.org
diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index 302c5d86b..4fa22b891 100644
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -39,11 +39,8 @@ class roles::debian_mirror {
 		}
 	}
 
-	# 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'] }
+	$mirrors = hiera('roles.debian_mirror', {})
+	$fastly_mirrors = $mirrors.filter |$h| { $h[1]['fastly-backend'] }
 	$hosts_to_check = $fastly_mirrors.map |$h| { $h[1]['service-hostname'] }
 
 	roles::mirror_health { 'ftp':