diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2023-05-02 22:32:10 +0200 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2023-05-03 12:12:12 +0200 |
| commit | 57b9c1d72ed8a2cf524c4be5ff1fdb1059568b44 (patch) | |
| tree | 28a1d246d95da498e2ac9a72b657750df60c9113 | |
| parent | Puppetserver: add default hiera configuration. (diff) | |
| download | profiles-57b9c1d72ed8a2cf524c4be5ff1fdb1059568b44.tar.gz profiles-57b9c1d72ed8a2cf524c4be5ff1fdb1059568b44.tar.xz | |
Change default hiera to be inlined.
It's hard to bootstrap hiera using hiera...
| -rw-r--r-- | data/common.pp | 12 | ||||
| -rw-r--r-- | manifests/puppetserver.pp | 19 |
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']) { |