From ab441b8451424d6f7e3e71983d13c7d69d38f1d1 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 10 Sep 2019 13:42:00 +0200 Subject: [PATCH] move hoster hieradata into its own directory --- hieradata/{ => hosters}/1und1-sec.yaml | 0 hieradata/{ => hosters}/accumu.yaml | 0 hieradata/{ => hosters}/br.yaml | 0 hieradata/{ => hosters}/brainfood.yaml | 0 hieradata/{ => hosters}/bytemark.yaml | 0 hieradata/{ => hosters}/csail.yaml | 0 hieradata/{ => hosters}/gatech.yaml | 0 hieradata/{ => hosters}/grnet.yaml | 0 hieradata/{ => hosters}/leaseweb.yaml | 0 hieradata/{ => hosters}/man-da.yaml | 0 hieradata/{ => hosters}/rapidswitch.yaml | 0 hieradata/{ => hosters}/sanger.yaml | 0 hieradata/{ => hosters}/sil.yaml | 0 hieradata/{ => hosters}/ubc.yaml | 0 hieradata/{ => hosters}/ugent.yaml | 0 hieradata/{ => hosters}/ynic.yaml | 0 hieradata/{ => hosters}/zivit.yaml | 0 modules/puppetmaster/files/hiera.yaml | 2 +- 18 files changed, 1 insertion(+), 1 deletion(-) rename hieradata/{ => hosters}/1und1-sec.yaml (100%) rename hieradata/{ => hosters}/accumu.yaml (100%) rename hieradata/{ => hosters}/br.yaml (100%) rename hieradata/{ => hosters}/brainfood.yaml (100%) rename hieradata/{ => hosters}/bytemark.yaml (100%) rename hieradata/{ => hosters}/csail.yaml (100%) rename hieradata/{ => hosters}/gatech.yaml (100%) rename hieradata/{ => hosters}/grnet.yaml (100%) rename hieradata/{ => hosters}/leaseweb.yaml (100%) rename hieradata/{ => hosters}/man-da.yaml (100%) rename hieradata/{ => hosters}/rapidswitch.yaml (100%) rename hieradata/{ => hosters}/sanger.yaml (100%) rename hieradata/{ => hosters}/sil.yaml (100%) rename hieradata/{ => hosters}/ubc.yaml (100%) rename hieradata/{ => hosters}/ugent.yaml (100%) rename hieradata/{ => hosters}/ynic.yaml (100%) rename hieradata/{ => hosters}/zivit.yaml (100%) diff --git a/hieradata/1und1-sec.yaml b/hieradata/hosters/1und1-sec.yaml similarity index 100% rename from hieradata/1und1-sec.yaml rename to hieradata/hosters/1und1-sec.yaml diff --git a/hieradata/accumu.yaml b/hieradata/hosters/accumu.yaml similarity index 100% rename from hieradata/accumu.yaml rename to hieradata/hosters/accumu.yaml diff --git a/hieradata/br.yaml b/hieradata/hosters/br.yaml similarity index 100% rename from hieradata/br.yaml rename to hieradata/hosters/br.yaml diff --git a/hieradata/brainfood.yaml b/hieradata/hosters/brainfood.yaml similarity index 100% rename from hieradata/brainfood.yaml rename to hieradata/hosters/brainfood.yaml diff --git a/hieradata/bytemark.yaml b/hieradata/hosters/bytemark.yaml similarity index 100% rename from hieradata/bytemark.yaml rename to hieradata/hosters/bytemark.yaml diff --git a/hieradata/csail.yaml b/hieradata/hosters/csail.yaml similarity index 100% rename from hieradata/csail.yaml rename to hieradata/hosters/csail.yaml diff --git a/hieradata/gatech.yaml b/hieradata/hosters/gatech.yaml similarity index 100% rename from hieradata/gatech.yaml rename to hieradata/hosters/gatech.yaml diff --git a/hieradata/grnet.yaml b/hieradata/hosters/grnet.yaml similarity index 100% rename from hieradata/grnet.yaml rename to hieradata/hosters/grnet.yaml diff --git a/hieradata/leaseweb.yaml b/hieradata/hosters/leaseweb.yaml similarity index 100% rename from hieradata/leaseweb.yaml rename to hieradata/hosters/leaseweb.yaml diff --git a/hieradata/man-da.yaml b/hieradata/hosters/man-da.yaml similarity index 100% rename from hieradata/man-da.yaml rename to hieradata/hosters/man-da.yaml diff --git a/hieradata/rapidswitch.yaml b/hieradata/hosters/rapidswitch.yaml similarity index 100% rename from hieradata/rapidswitch.yaml rename to hieradata/hosters/rapidswitch.yaml diff --git a/hieradata/sanger.yaml b/hieradata/hosters/sanger.yaml similarity index 100% rename from hieradata/sanger.yaml rename to hieradata/hosters/sanger.yaml diff --git a/hieradata/sil.yaml b/hieradata/hosters/sil.yaml similarity index 100% rename from hieradata/sil.yaml rename to hieradata/hosters/sil.yaml diff --git a/hieradata/ubc.yaml b/hieradata/hosters/ubc.yaml similarity index 100% rename from hieradata/ubc.yaml rename to hieradata/hosters/ubc.yaml diff --git a/hieradata/ugent.yaml b/hieradata/hosters/ugent.yaml similarity index 100% rename from hieradata/ugent.yaml rename to hieradata/hosters/ugent.yaml diff --git a/hieradata/ynic.yaml b/hieradata/hosters/ynic.yaml similarity index 100% rename from hieradata/ynic.yaml rename to hieradata/hosters/ynic.yaml diff --git a/hieradata/zivit.yaml b/hieradata/hosters/zivit.yaml similarity index 100% rename from hieradata/zivit.yaml rename to hieradata/hosters/zivit.yaml diff --git a/modules/puppetmaster/files/hiera.yaml b/modules/puppetmaster/files/hiera.yaml index b7a09f86b..4b5250004 100644 --- 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: -- 2.20.1