move hiera.yaml into repo root

diff --git a/.gitignore b/.gitignore
index 6e5214a..a5348d4 100644 (file)
--- 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 (file)
index 0000000..4b52500
--- /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 (file)
index 4b52500..0000000
--- 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 9fed024..080bee5 100644 (file)
--- 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'
        }