From 265d1af56a8a1d59080b63bff8aa24c8db4df42b Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 7 Nov 2012 17:40:39 +0100 Subject: [PATCH] rename vm to diskimage, ensure state is setup Signed-off-by: Nico Schottelius --- cdist/conf/type/__qemu_img/gencode-remote | 7 ++++--- cdist/conf/type/__qemu_img/manifest | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cdist/conf/type/__qemu_img/gencode-remote b/cdist/conf/type/__qemu_img/gencode-remote index acadcef0..e5ff1b4f 100644 --- a/cdist/conf/type/__qemu_img/gencode-remote +++ b/cdist/conf/type/__qemu_img/gencode-remote @@ -2,7 +2,8 @@ # State: absent is handled by manifest - we need only to do stuff if image is # not existing and state != absent # -[ -f "$__object/parameter/state" ] && state="$(cat "$__object/parameter/state")" +state="present" +[ -f "$__object/parameter/state" ] state="$(cat "$__object/parameter/state")" [ "$state" = "absent" ] && exit 0 exists="$(cat "$__object/explorer/exists")" @@ -15,6 +16,6 @@ exists="$(cat "$__object/explorer/exists")" format=qcow2 [ -f "$__object/parameter/format" ] && format="$(cat "$__object/parameter/format")" size="$(cat "$__object/parameter/size")" -vm="/$__object_id" +diskimage="/$__object_id" -echo qemu-img create -f \"$format\" \"$vm\" \"$size\" +echo qemu-img create -f \"$format\" \"$diskimage\" \"$size\" diff --git a/cdist/conf/type/__qemu_img/manifest b/cdist/conf/type/__qemu_img/manifest index d343e188..b835301d 100644 --- a/cdist/conf/type/__qemu_img/manifest +++ b/cdist/conf/type/__qemu_img/manifest @@ -3,12 +3,13 @@ # format=qcow2 +state=present [ -f "$__object/parameter/format" ] && format="$(cat "$__object/parameter/format")" [ -f "$__object/parameter/state" ] && state="$(cat "$__object/parameter/state")" -vm="/$__object_id" +diskimage="/$__object_id" # Absent is ensured by __file, present by gencode-remote if [ "$state" = "absent" ]; then - __file "$vm" --state absent + __file "$diskimage" --state absent fi