From 8efd13172f64d0cc7cf277ab5aeea97e9a8f86c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Wed, 9 Feb 2022 19:47:08 +0100 Subject: Reordering. --- manifests/machine.pp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'manifests/machine.pp') diff --git a/manifests/machine.pp b/manifests/machine.pp index de6d848..e6d01e2 100644 --- a/manifests/machine.pp +++ b/manifests/machine.pp @@ -15,6 +15,13 @@ define nspawn::machine ( $domain = $facts['domain'] $root = "${machine_dir}/${machine}" + exec { "lvcreate -n vm-${machine} -V 100G --thinpool lvpoolData VolGroup": + creates => "/dev/VolGroup/vm-${machine}", + path => ['/usr/bin',], + } -> systemd_mount { "/var/lib/machines/${machine}": + what => "/dev/VolGroup/vm-${machine}" + } + # Copies image to us # TODO does this actually do anything more than a deep copy? exec { "Create ${machine} from template": @@ -49,13 +56,6 @@ define nspawn::machine ( # TODO deep merge? } + $nspawn_opts - exec { "lvcreate -n vm-${machine} -V 100G --thinpool lvpoolData VolGroup": - creates => "/dev/VolGroup/vm-${machine}", - path => ['/usr/bin',], - } -> systemd_mount { "/var/lib/machines/${machine}": - what => "/dev/VolGroup/vm-${machine}" - } - file { "/etc/systemd/nspawn/${machine}.nspawn": ensure => file, content => epp('nspawn/unit_file.epp', { -- cgit v1.2.3