From 9d1ab953e4515ead9837444e14dc7842b97b6166 Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Fri, 2 Feb 2018 11:06:08 +0100 Subject: [PATCH] Simplify debian_mirror for hiera-hash --- modules/roles/manifests/debian_mirror.pp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp index 4fa22b891..2e22aaa16 100644 --- a/modules/roles/manifests/debian_mirror.pp +++ b/modules/roles/manifests/debian_mirror.pp @@ -3,9 +3,8 @@ 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') + $listen_addresses = hiera('roles.debian_mirror') + .dig($::fqdn, 'listen-addresses') .then |$a| { $a + [ '127.0.0.1:80', '[::1]:80' ] } .lest || { ['*:80'] } -- 2.20.1