From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 21 Sep 2019 16:48:14 +0000 (+0200)
Subject: move hiera.yaml into repo root
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=408da87e6e5944d7079b181eb14a48a560fc4784

move hiera.yaml into repo root
---

diff --git a/.gitignore b/.gitignore
index 6e5214a3c..a5348d4fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 puppet.conf
 .config-version
-hiera.yaml
 modules/hiera-puppet
 modules/exim/files/email-virtualdomains/
 modules/roles/manifests/pubsub/params.pp
diff --git a/hiera.yaml b/hiera.yaml
new file mode 100644
index 000000000..4b5250004
--- /dev/null
+++ b/hiera.yaml
@@ -0,0 +1,10 @@
+---
+:hierarchy:
+  - 'nodes/%{trusted.certname}'
+  - 'hosters/%{hoster}'
+  - 'clusters/%{cluster}'
+  - 'common'
+:backends:
+  - yaml
+:yaml:
+  :datadir: '/etc/puppet/hieradata'
diff --git a/modules/puppetmaster/files/hiera.yaml b/modules/puppetmaster/files/hiera.yaml
deleted file mode 100644
index 4b5250004..000000000
--- a/modules/puppetmaster/files/hiera.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-:hierarchy:
-  - 'nodes/%{trusted.certname}'
-  - 'hosters/%{hoster}'
-  - 'clusters/%{cluster}'
-  - 'common'
-:backends:
-  - yaml
-:yaml:
-  :datadir: '/etc/puppet/hieradata'
diff --git a/modules/puppetmaster/manifests/init.pp b/modules/puppetmaster/manifests/init.pp
index 9fed0247b..080bee57d 100644
--- a/modules/puppetmaster/manifests/init.pp
+++ b/modules/puppetmaster/manifests/init.pp
@@ -3,9 +3,6 @@ class puppetmaster {
 	package { 'puppetmaster':
 		ensure => installed,
 	}
-	file { '/etc/puppet/hiera.yaml':
-		source => 'puppet:///modules/puppetmaster/hiera.yaml'
-	}
 	file { '/etc/puppet/puppetdb.conf':
 		source => 'puppet:///modules/puppetmaster/puppetdb.conf'
 	}