diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2023-06-23 19:07:03 +0200 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2023-06-23 19:07:03 +0200 |
| commit | 2dd5a0ec316410ed3c52b0e05873679d44e33070 (patch) | |
| tree | 96d8cf9826e252f3c7d5e4c584bb60d06e4b1d25 | |
| parent | fix (diff) | |
| download | nspawn-2dd5a0ec316410ed3c52b0e05873679d44e33070.tar.gz nspawn-2dd5a0ec316410ed3c52b0e05873679d44e33070.tar.xz | |
fix
| -rw-r--r-- | manifests/machine.pp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/manifests/machine.pp b/manifests/machine.pp index 17cd3a9..e25a5b9 100644 --- a/manifests/machine.pp +++ b/manifests/machine.pp @@ -38,14 +38,12 @@ define nspawn::machine ( ) { $root = "${nspawn::machine_dir}/${name}" - $almost_final_config = $merge ? { + $final_config = $merge ? { 'deep' => deep_merge($nspawn::config, $config), 'shallow' => $nspawn::config + $config, 'override' => $config, } - $final_config = $nspawn::config_base + $almost_final_config - file { "${nspawn::nspawn_dir}/${name}.nspawn": ensure => $ensure, content => epp("${module_name}/systemd/nspawn.epp", { |