summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo Hörnquist <hugo@lysator.liu.se>2022-01-04 02:01:47 +0100
committerHugo Hörnquist <hugo@lysator.liu.se>2022-01-04 02:01:47 +0100
commite213e07d16a6ea5dce51f23d7dd57d57c856e8ef (patch)
treea58c1b14fc9b8517d3e47463a29e0946ce67b8fd
parentfix efi bootmgr. (diff)
downloadwebdav_server-e213e07d16a6ea5dce51f23d7dd57d57c856e8ef.tar.gz
webdav_server-e213e07d16a6ea5dce51f23d7dd57d57c856e8ef.tar.xz
Manage hiera through hiera.
-rw-r--r--modules/profiles/manifests/puppetserver.pp22
1 files changed, 3 insertions, 19 deletions
diff --git a/modules/profiles/manifests/puppetserver.pp b/modules/profiles/manifests/puppetserver.pp
index 0dd1146..82de2b5 100644
--- a/modules/profiles/manifests/puppetserver.pp
+++ b/modules/profiles/manifests/puppetserver.pp
@@ -1,4 +1,6 @@
-class profiles::puppetserver {
+class profiles::puppetserver (
+ Hash $hiera,
+) {
# required for the git hook
ensure_packages(['ruby'])
@@ -35,24 +37,6 @@ class profiles::puppetserver {
server_strict_variables => true,
}
- $hiera = {
- 'version' => 5,
- 'defaults' => {
- 'datadir' => '/puppet',
- 'data_hash' => 'yaml_data',
- },
- 'hierarchy' => [
- {
- 'name' => 'Secrets',
- 'path' => '/etc/secrets/data.yaml',
- },
- {
- 'name' => 'local nodes',
- 'path' => 'nodes/%{trusted.certname}.yaml'
- },
- ]
- }
-
file { "/etc/puppetlabs/puppet/hiera.yaml":
ensure => file,
content => hash2yaml($hiera, {