summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/common.pp12
-rw-r--r--manifests/puppetserver.pp19
2 files changed, 18 insertions, 13 deletions
diff --git a/data/common.pp b/data/common.pp
deleted file mode 100644
index ac407dc..0000000
--- a/data/common.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-profiles::puppetserver::hiera:
- version: 5
- defaults:
- datadir: "/puppet"
- hierarchy:
- - name: Data
- data_hash: yaml_data
- paths:
- - nodes/%{literal('%')}{trusted.certname}.yaml
- - os/name/%{literal('%')}{facts.os.name}.yaml
- - os/family/%{literal('%')}{facts.os.family}.yaml
- - common.yaml
diff --git a/manifests/puppetserver.pp b/manifests/puppetserver.pp
index 34ab2c4..0dc25a1 100644
--- a/manifests/puppetserver.pp
+++ b/manifests/puppetserver.pp
@@ -1,5 +1,22 @@
class profiles::puppetserver (
- Hash $hiera,
+ Hash $hiera = {
+ 'version' => 5,
+ 'defaults' => {
+ 'datadir' => '/puppet',
+ },
+ 'hierarchy' => [
+ {
+ 'name' => 'Data',
+ 'data_hash' => 'yaml_data',
+ 'paths' => [
+ 'nodes/%{trusted.certname}.yaml',
+ 'os/name/%{facts.os.name}.yaml',
+ 'os/family/%{facts.os.family}.yaml',
+ 'common.yaml',
+ ],
+ }
+ ]
+ },
) {
if defined(Class['profiles::puppetagent']) {