From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 10 Sep 2019 14:25:33 +0000 (+0200)
Subject: schroot: use hiera debian mirror
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=02c02608989f132ed0fbb268a7bf2afe6994f7c6;p=mirror%2Fdsa-puppet.git

schroot: use hiera debian mirror
---

diff --git a/modules/schroot/manifests/init.pp b/modules/schroot/manifests/init.pp
index 7c5e00896..4bd8964e7 100644
--- a/modules/schroot/manifests/init.pp
+++ b/modules/schroot/manifests/init.pp
@@ -1,4 +1,6 @@
 class schroot {
+	$mirror = lookup('apt::sources::debian::location', {'strategy' => 'first'})
+
 	package { 'schroot':
 		ensure => installed,
 		tag    => extra_repo,
@@ -53,7 +55,9 @@ class schroot {
 		require => Package['schroot'],
 	}
 	file { '/etc/schroot/dsa/default-mirror':
-		content => template('schroot/default-mirror.erb'),
+		content => @("EOT"),
+			$mirror
+			| EOT
 	}
 	file { '/etc/schroot/dsa/config':
 		source  => 'puppet:///modules/schroot/schroot-dsa/config',
diff --git a/modules/schroot/templates/default-mirror.erb b/modules/schroot/templates/default-mirror.erb
deleted file mode 100644
index ab8772f74..000000000
--- a/modules/schroot/templates/default-mirror.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<%=
-ninfo = scope.lookupvar('site::nodeinfo')
-if ninfo['hoster'].has_key?('mirror-debian') then
-    ninfo['hoster']['mirror-debian']
-else
-    'https://deb.debian.org/debian'
-end
-%>