diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-01-02 03:16:44 +0100 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-01-02 03:16:44 +0100 |
| commit | 4a22cba6a284381e1ffabba8fec4aa8949a3d956 (patch) | |
| tree | 5e669bfea1d972aa3be216c47ac4a84752916e20 | |
| parent | Nspawn with a bind mount. (diff) | |
| download | webdav_server-4a22cba6a284381e1ffabba8fec4aa8949a3d956.tar.gz webdav_server-4a22cba6a284381e1ffabba8fec4aa8949a3d956.tar.xz | |
Move paths.
| -rw-r--r-- | hiera.yaml | 2 | ||||
| -rw-r--r-- | modules/nspawn/manifests/machine.pp | 4 | ||||
| -rw-r--r-- | modules/profiles/manifests/puppetserver.pp | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -12,6 +12,6 @@ hierarchy: path: os/%{facts.os.family}.yaml - name: Secrets path: data.yaml - datadir: /etc/secrets + datadir: /puppet - name: Common data path: common.yaml diff --git a/modules/nspawn/manifests/machine.pp b/modules/nspawn/manifests/machine.pp index 1c688f6..a16a82c 100644 --- a/modules/nspawn/manifests/machine.pp +++ b/modules/nspawn/manifests/machine.pp @@ -7,6 +7,10 @@ define nspawn::machine ( require ::nspawn::setup + file { "/var/lib/machines/${machine}/puppet": + ensure => directory, + } + file { "/etc/systemd/nspawn/${machine}.nspawn": content => @("EOF") [Exec] diff --git a/modules/profiles/manifests/puppetserver.pp b/modules/profiles/manifests/puppetserver.pp index f8fc47c..d438503 100644 --- a/modules/profiles/manifests/puppetserver.pp +++ b/modules/profiles/manifests/puppetserver.pp @@ -11,7 +11,7 @@ class profiles::puppetserver { inifile::create_ini_settings( { common => { node_fmt => yaml, - nodes => '/nodes.yaml', + nodes => '/puppet/nodes.yaml', }, }, { |