X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=hieradata%2Fcommon.yaml;h=d7018108527969e9940e19e1ddf404f585a523e2;hb=36ecfdc1752240ec82299211743f184187970c6e;hp=eef91e9821b18f8e1c8049b3cf83476e65ef606f;hpb=4c575f42e0f685864e026a7bd78f9a30b8f5c736;p=mirror%2Fdsa-puppet.git

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index eef91e982..d70181085 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -1,7 +1,14 @@
 ---
-nameservers: []
-searchpaths: []
-resolvoptions: []
+
+lookup_options:
+  # with merge: unique entries in other hiera sources add to the array
+  resolv::searchpaths:
+    merge: unique
+  apt::sources::debian::location:
+    merge: unique
+
+resolv::nameservers: []
+resolv::searchpaths: ['debian.org']
 allow_dns_query: []
 role_config__mirrors:
   mirror_basedir_prefix: '/srv/mirrors/'
@@ -18,6 +25,10 @@ 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'
+apt::sources::debian::location: 'https://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 +39,6 @@ roles:
   bugs_base:
     - buxtehude.debian.org
     - beach.debian.org
-  buildd_master:
-    - wuiet.debian.org
   contributors:
     - nono.debian.org
   dbmaster:
@@ -59,8 +68,6 @@ roles:
     - adayevskaya.debian.org
   historicalpackages:
     - hier.debian.org
-  jenkins:
-    - jerea.debian.org
   keyring:
     - kaufmann.debian.org
   lists:
@@ -98,8 +105,6 @@ roles:
   pubsub:
     - rainier.debian.org
     - rapoport.debian.org
-  puppetmaster:
-    - handel.debian.org
   qamaster:
     - quantz.debian.org
   rtmaster:
@@ -174,6 +179,7 @@ roles:
   static_master:
     - dillon.debian.org
     - fasolo.debian.org
+    - manziarly.debian.org
     - porta.debian.org
     - static-master-grnet-01.debian.org
   static_mirror:
@@ -338,7 +344,6 @@ roles:
     - melartin.debian.org
     - sallinen.debian.org
     - seger.debian.org
-    - sibelius.debian.org
     - snapshotdb-manda-01.debian.org
     - vittoria.debian.org
   salsa.debian.org:
@@ -377,4 +382,4 @@ roles:
     - cgi-grnet-01.debian.org
 
 classes:
-  - base
+  - base::includes