move hoster hieradata into its own directory

diff --git a/hieradata/1und1-sec.yaml b/hieradata/1und1-sec.yaml
deleted file mode 100644 (file)
index 8c07506..0000000
--- a/hieradata/1und1-sec.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-searchpaths:
-  - debprivate-oneandone.debian.org

diff --git a/hieradata/accumu.yaml b/hieradata/accumu.yaml
deleted file mode 100644 (file)
index 0e23d01..0000000
--- a/hieradata/accumu.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-nameservers:
-  - 130.239.18.251
-  - 2001:6b0:e:2018::251
-  - 130.239.18.252
-  - 2001:6b0:e:2018::252
-  - 130.239.1.90
-  - 130.239.4.100
-searchpaths:
-  - priv.accumu.debian.org
-  - debprivate-accumu.debian.org

diff --git a/hieradata/br.yaml b/hieradata/br.yaml
deleted file mode 100644 (file)
index 970c10b..0000000
--- a/hieradata/br.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-nameservers:
-  - 200.236.31.1
-  - 200.17.202.3
-firewall_blocks_dns: true

diff --git a/hieradata/brainfood.yaml b/hieradata/brainfood.yaml
deleted file mode 100644 (file)
index 4cb141c..0000000
--- a/hieradata/brainfood.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-searchpaths:
-  - debprivate-brainfood.debian.org

diff --git a/hieradata/bytemark.yaml b/hieradata/bytemark.yaml
deleted file mode 100644 (file)
index 739b2b9..0000000
--- a/hieradata/bytemark.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-nameservers:
-  - 5.153.231.241
-  - 5.153.231.242
-allow_dns_query:
-  - 5.153.231.0/24
-# currently only used by VMs with systemd-timesync
-local-timeservers:
-  - bm-bl1.debian.org
-  - bm-bl2.debian.org

diff --git a/hieradata/csail.yaml b/hieradata/csail.yaml
deleted file mode 100644 (file)
index e3ff9c7..0000000
--- a/hieradata/csail.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-nameservers:
-  - 128.30.2.24
-  - 128.30.2.25
-  - 128.30.0.125
-searchpaths:
-  - priv.csail.debian.org
-# currently only used by VMs with systemd-timesync
-local-timeservers:
-  - csail-node01.debian.org
-  - csail-node02.debian.org

diff --git a/hieradata/gatech.yaml b/hieradata/gatech.yaml
deleted file mode 100644 (file)
index 0badec9..0000000
--- a/hieradata/gatech.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-nameservers:
-  - 143.215.130.231
-  - 143.215.130.232

diff --git a/hieradata/grnet.yaml b/hieradata/grnet.yaml
deleted file mode 100644 (file)
index a6b884a..0000000
--- a/hieradata/grnet.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-nameservers:
-  - 62.217.126.164
-  - 194.177.210.210
-searchpaths:
-  - debprivate-grnet.debian.org
-# currently only used by VMs with systemd-timesync
-local-timeservers:
-  - grnet-node01.debian.org
-  - grnet-node02.debian.org

diff --git a/hieradata/hosters/1und1-sec.yaml b/hieradata/hosters/1und1-sec.yaml
new file mode 100644 (file)
index 0000000..8c07506
--- /dev/null
+++ b/hieradata/hosters/1und1-sec.yaml
@@ -0,0 +1,3 @@
+---
+searchpaths:
+  - debprivate-oneandone.debian.org

diff --git a/hieradata/hosters/accumu.yaml b/hieradata/hosters/accumu.yaml
new file mode 100644 (file)
index 0000000..0e23d01
--- /dev/null
+++ b/hieradata/hosters/accumu.yaml
@@ -0,0 +1,11 @@
+---
+nameservers:
+  - 130.239.18.251
+  - 2001:6b0:e:2018::251
+  - 130.239.18.252
+  - 2001:6b0:e:2018::252
+  - 130.239.1.90
+  - 130.239.4.100
+searchpaths:
+  - priv.accumu.debian.org
+  - debprivate-accumu.debian.org

diff --git a/hieradata/hosters/br.yaml b/hieradata/hosters/br.yaml
new file mode 100644 (file)
index 0000000..970c10b
--- /dev/null
+++ b/hieradata/hosters/br.yaml
@@ -0,0 +1,5 @@
+---
+nameservers:
+  - 200.236.31.1
+  - 200.17.202.3
+firewall_blocks_dns: true

diff --git a/hieradata/hosters/brainfood.yaml b/hieradata/hosters/brainfood.yaml
new file mode 100644 (file)
index 0000000..4cb141c
--- /dev/null
+++ b/hieradata/hosters/brainfood.yaml
@@ -0,0 +1,3 @@
+---
+searchpaths:
+  - debprivate-brainfood.debian.org

diff --git a/hieradata/hosters/bytemark.yaml b/hieradata/hosters/bytemark.yaml
new file mode 100644 (file)
index 0000000..739b2b9
--- /dev/null
+++ b/hieradata/hosters/bytemark.yaml
@@ -0,0 +1,10 @@
+---
+nameservers:
+  - 5.153.231.241
+  - 5.153.231.242
+allow_dns_query:
+  - 5.153.231.0/24
+# currently only used by VMs with systemd-timesync
+local-timeservers:
+  - bm-bl1.debian.org
+  - bm-bl2.debian.org

diff --git a/hieradata/hosters/csail.yaml b/hieradata/hosters/csail.yaml
new file mode 100644 (file)
index 0000000..e3ff9c7
--- /dev/null
+++ b/hieradata/hosters/csail.yaml
@@ -0,0 +1,11 @@
+---
+nameservers:
+  - 128.30.2.24
+  - 128.30.2.25
+  - 128.30.0.125
+searchpaths:
+  - priv.csail.debian.org
+# currently only used by VMs with systemd-timesync
+local-timeservers:
+  - csail-node01.debian.org
+  - csail-node02.debian.org

diff --git a/hieradata/hosters/gatech.yaml b/hieradata/hosters/gatech.yaml
new file mode 100644 (file)
index 0000000..0badec9
--- /dev/null
+++ b/hieradata/hosters/gatech.yaml
@@ -0,0 +1,4 @@
+---
+nameservers:
+  - 143.215.130.231
+  - 143.215.130.232

diff --git a/hieradata/hosters/grnet.yaml b/hieradata/hosters/grnet.yaml
new file mode 100644 (file)
index 0000000..a6b884a
--- /dev/null
+++ b/hieradata/hosters/grnet.yaml
@@ -0,0 +1,10 @@
+---
+nameservers:
+  - 62.217.126.164
+  - 194.177.210.210
+searchpaths:
+  - debprivate-grnet.debian.org
+# currently only used by VMs with systemd-timesync
+local-timeservers:
+  - grnet-node01.debian.org
+  - grnet-node02.debian.org

diff --git a/hieradata/hosters/leaseweb.yaml b/hieradata/hosters/leaseweb.yaml
new file mode 100644 (file)
index 0000000..4c52247
--- /dev/null
+++ b/hieradata/hosters/leaseweb.yaml
@@ -0,0 +1,6 @@
+---
+nameservers:
+  - 85.17.150.123
+  - 85.17.96.69
+  - 85.17.150.123
+  - 62.212.64.122

diff --git a/hieradata/hosters/man-da.yaml b/hieradata/hosters/man-da.yaml
new file mode 100644 (file)
index 0000000..8500f91
--- /dev/null
+++ b/hieradata/hosters/man-da.yaml
@@ -0,0 +1,14 @@
+---
+nameservers:
+  - 82.195.75.109
+  - 82.195.75.103
+allow_dns_query:
+  - 82.195.75.64/26
+  - 172.29.180.0/24
+searchpaths:
+  - manda.debian.org
+  - priv.manda.debian.org
+# currently only used by VMs with systemd-timesync
+local-timeservers:
+  - manda-node03.debian.org
+  - manda-node04.debian.org

diff --git a/hieradata/hosters/rapidswitch.yaml b/hieradata/hosters/rapidswitch.yaml
new file mode 100644 (file)
index 0000000..88e5b1d
--- /dev/null
+++ b/hieradata/hosters/rapidswitch.yaml
@@ -0,0 +1,5 @@
+---
+nameservers:
+  - 87.117.198.200
+  - 87.117.237.100
+  - 87.117.196.200

diff --git a/hieradata/hosters/sanger.yaml b/hieradata/hosters/sanger.yaml
new file mode 100644 (file)
index 0000000..4efe07b
--- /dev/null
+++ b/hieradata/hosters/sanger.yaml
@@ -0,0 +1,8 @@
+---
+nameservers:
+  - 193.62.202.28
+  - 193.62.202.29
+searchpaths:
+  - debprivate-sanger.debian.org
+allow_dns_query:
+  - 193.62.202.24/29

diff --git a/hieradata/hosters/sil.yaml b/hieradata/hosters/sil.yaml
new file mode 100644 (file)
index 0000000..0de2715
--- /dev/null
+++ b/hieradata/hosters/sil.yaml
@@ -0,0 +1,3 @@
+---
+searchpaths:
+  - priv.sil.debian.org

diff --git a/hieradata/hosters/ubc.yaml b/hieradata/hosters/ubc.yaml
new file mode 100644 (file)
index 0000000..ede29bd
--- /dev/null
+++ b/hieradata/hosters/ubc.yaml
@@ -0,0 +1,23 @@
+---
+nameservers:
+  # ubc-enc2bl02
+  - 209.87.16.2
+  - 2607:f8f0:614:1::1274:2
+  # ubc-enc2bl09
+  - 209.87.16.9
+  - 2607:f8f0:614:1::1274:9
+  # ubc-enc2bl10
+  - 209.87.16.10
+  - 2607:f8f0:614:1::1274:10
+searchpaths:
+  - debprivate-ubc.debian.org
+  - priv.ubc.debian.org
+allow_dns_query:
+  - 206.12.19.0/24
+  - 209.87.16.0/24
+  - 2607:f8f0:610:4000::/64
+  - 2607:F8F0:614:1::/64
+# currently only used by VMs with systemd-timesync
+local-timeservers:
+  - ubc-enc2bl01.debian.org
+  - ubc-enc2bl02.debian.org

diff --git a/hieradata/hosters/ugent.yaml b/hieradata/hosters/ugent.yaml
new file mode 100644 (file)
index 0000000..0787a52
--- /dev/null
+++ b/hieradata/hosters/ugent.yaml
@@ -0,0 +1,3 @@
+---
+nameservers:
+  - 157.193.40.42

diff --git a/hieradata/hosters/ynic.yaml b/hieradata/hosters/ynic.yaml
new file mode 100644 (file)
index 0000000..89440d4
--- /dev/null
+++ b/hieradata/hosters/ynic.yaml
@@ -0,0 +1,6 @@
+---
+nameservers:
+  - 144.32.169.74
+  - 144.32.169.75
+  - 144.32.169.76
+firewall_blocks_dns: true

diff --git a/hieradata/hosters/zivit.yaml b/hieradata/hosters/zivit.yaml
new file mode 100644 (file)
index 0000000..809a469
--- /dev/null
+++ b/hieradata/hosters/zivit.yaml
@@ -0,0 +1,5 @@
+---
+nameservers:
+  - 80.245.147.141
+  - 80.245.147.142
+  - 80.245.147.143

diff --git a/hieradata/leaseweb.yaml b/hieradata/leaseweb.yaml
deleted file mode 100644 (file)
index 4c52247..0000000
--- a/hieradata/leaseweb.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-nameservers:
-  - 85.17.150.123
-  - 85.17.96.69
-  - 85.17.150.123
-  - 62.212.64.122

diff --git a/hieradata/man-da.yaml b/hieradata/man-da.yaml
deleted file mode 100644 (file)
index 8500f91..0000000
--- a/hieradata/man-da.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-nameservers:
-  - 82.195.75.109
-  - 82.195.75.103
-allow_dns_query:
-  - 82.195.75.64/26
-  - 172.29.180.0/24
-searchpaths:
-  - manda.debian.org
-  - priv.manda.debian.org
-# currently only used by VMs with systemd-timesync
-local-timeservers:
-  - manda-node03.debian.org
-  - manda-node04.debian.org

diff --git a/hieradata/rapidswitch.yaml b/hieradata/rapidswitch.yaml
deleted file mode 100644 (file)
index 88e5b1d..0000000
--- a/hieradata/rapidswitch.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-nameservers:
-  - 87.117.198.200
-  - 87.117.237.100
-  - 87.117.196.200

diff --git a/hieradata/sanger.yaml b/hieradata/sanger.yaml
deleted file mode 100644 (file)
index 4efe07b..0000000
--- a/hieradata/sanger.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-nameservers:
-  - 193.62.202.28
-  - 193.62.202.29
-searchpaths:
-  - debprivate-sanger.debian.org
-allow_dns_query:
-  - 193.62.202.24/29

diff --git a/hieradata/sil.yaml b/hieradata/sil.yaml
deleted file mode 100644 (file)
index 0de2715..0000000
--- a/hieradata/sil.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-searchpaths:
-  - priv.sil.debian.org

diff --git a/hieradata/ubc.yaml b/hieradata/ubc.yaml
deleted file mode 100644 (file)
index ede29bd..0000000
--- a/hieradata/ubc.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-nameservers:
-  # ubc-enc2bl02
-  - 209.87.16.2
-  - 2607:f8f0:614:1::1274:2
-  # ubc-enc2bl09
-  - 209.87.16.9
-  - 2607:f8f0:614:1::1274:9
-  # ubc-enc2bl10
-  - 209.87.16.10
-  - 2607:f8f0:614:1::1274:10
-searchpaths:
-  - debprivate-ubc.debian.org
-  - priv.ubc.debian.org
-allow_dns_query:
-  - 206.12.19.0/24
-  - 209.87.16.0/24
-  - 2607:f8f0:610:4000::/64
-  - 2607:F8F0:614:1::/64
-# currently only used by VMs with systemd-timesync
-local-timeservers:
-  - ubc-enc2bl01.debian.org
-  - ubc-enc2bl02.debian.org

diff --git a/hieradata/ugent.yaml b/hieradata/ugent.yaml
deleted file mode 100644 (file)
index 0787a52..0000000
--- a/hieradata/ugent.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-nameservers:
-  - 157.193.40.42

diff --git a/hieradata/ynic.yaml b/hieradata/ynic.yaml
deleted file mode 100644 (file)
index 89440d4..0000000
--- a/hieradata/ynic.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-nameservers:
-  - 144.32.169.74
-  - 144.32.169.75
-  - 144.32.169.76
-firewall_blocks_dns: true

diff --git a/hieradata/zivit.yaml b/hieradata/zivit.yaml
deleted file mode 100644 (file)
index 809a469..0000000
--- a/hieradata/zivit.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-nameservers:
-  - 80.245.147.141
-  - 80.245.147.142
-  - 80.245.147.143

diff --git a/modules/puppetmaster/files/hiera.yaml b/modules/puppetmaster/files/hiera.yaml
index b7a09f8..4b52500 100644 (file)
--- a/modules/puppetmaster/files/hiera.yaml
+++ b/modules/puppetmaster/files/hiera.yaml
@@ -1,7 +1,7 @@
 ---
 :hierarchy:
   - 'nodes/%{trusted.certname}'
-  - '%{hoster}'
+  - 'hosters/%{hoster}'
   - 'clusters/%{cluster}'
   - 'common'
 :backends: