ferm::ftp_conntrack: remove jessie support

[mirror/dsa-puppet.git] / hieradata / common.yaml

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index f025d92..d79bbf8 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -18,6 +18,15 @@ paths:
   letsencrypt_dir: '/srv/puppet.debian.org/from-letsencrypt'
   auto_certs_dir: '/srv/puppet.debian.org/ca/RESULT/certs'
   auto_clientcerts_dir: '/srv/puppet.debian.org/ca/RESULT/clientcerts'
+
+lookup_options:
+  # entries in other hiera sources add to the array
+  apt::sources::debian::location:
+    merge: unique
+apt::sources::debian::location: 'http://deb.debian.org/debian/'
+
+# all of these should be retired in favour of including the class role
+# with the host. weasel, 2019-09
 roles:
   bugsmx:
     - buxtehude.debian.org
@@ -28,8 +37,6 @@ roles:
   bugs_base:
     - buxtehude.debian.org
     - beach.debian.org
-  buildd_master:
-    - wuiet.debian.org
   contributors:
     - nono.debian.org
   dbmaster:
@@ -59,8 +66,6 @@ roles:
     - adayevskaya.debian.org
   historicalpackages:
     - hier.debian.org
-  jenkins:
-    - jerea.debian.org
   keyring:
     - kaufmann.debian.org
   lists:
@@ -98,8 +103,6 @@ roles:
   pubsub:
     - rainier.debian.org
     - rapoport.debian.org
-  puppetmaster:
-    - handel.debian.org
   qamaster:
     - quantz.debian.org
   rtmaster:
@@ -170,6 +173,7 @@ roles:
     - tate.debian.org
     - ticharich.debian.org
     - wilder.debian.org
+    - wuiet.debian.org
   static_master:
     - dillon.debian.org
     - fasolo.debian.org
@@ -196,6 +200,7 @@ roles:
     - dillon.debian.org
     - donizetti.debian.org
     - fasolo.debian.org
+    - kaufmann.debian.org
     - lindsay.debian.org
     - manziarly.debian.org
     - mekeel.debian.org
@@ -213,6 +218,7 @@ roles:
     - mirror-isc.debian.org
     - mirror-umn.debian.org
     - schmelzer.debian.org
+    - smit.debian.org
   tracker:
     - ticharich.debian.org
   udd:
@@ -331,10 +337,11 @@ roles:
     - buxtehude.debian.org
     - danzi.debian.org
     - fasolo.debian.org
+    - lw07.debian.org
     - melartin.debian.org
     - sallinen.debian.org
     - seger.debian.org
-    - sibelius.debian.org
+    - snapshotdb-manda-01.debian.org
     - vittoria.debian.org
   salsa.debian.org:
     - godard.debian.org
@@ -370,3 +377,6 @@ roles:
     - lw08.debian.org
   anonscm:
     - cgi-grnet-01.debian.org
+
+classes:
+  - base::includes