From e213e07d16a6ea5dce51f23d7dd57d57c856e8ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Tue, 4 Jan 2022 02:01:47 +0100
Subject: Manage hiera through hiera.

---
 modules/profiles/manifests/puppetserver.pp | 22 +++-------------------
 1 file 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, {
-- 
cgit v1.2.3