summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/machine.pp4
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", {