From 02c3fe49887d75d28d581221cf51eeaf00e66379 Mon Sep 17 00:00:00 2001
From: Daniel Heule <hda@sfs.biz>
Date: Tue, 21 Jan 2014 22:33:10 +0100
Subject: [PATCH] parameter default handling in __qemu_img type corrected

---
 cdist/conf/type/__qemu_img/gencode-remote           | 6 ++----
 cdist/conf/type/__qemu_img/manifest                 | 6 ++----
 cdist/conf/type/__qemu_img/parameter/default/format | 1 +
 cdist/conf/type/__qemu_img/parameter/default/state  | 1 +
 cdist/conf/type/__qemu_img/parameter/optional       | 1 +
 5 files changed, 7 insertions(+), 8 deletions(-)
 create mode 100644 cdist/conf/type/__qemu_img/parameter/default/format
 create mode 100644 cdist/conf/type/__qemu_img/parameter/default/state

diff --git a/cdist/conf/type/__qemu_img/gencode-remote b/cdist/conf/type/__qemu_img/gencode-remote
index 2a76cf8f..6e4bb4d0 100644
--- a/cdist/conf/type/__qemu_img/gencode-remote
+++ b/cdist/conf/type/__qemu_img/gencode-remote
@@ -2,8 +2,7 @@
 # State: absent is handled by manifest - we need only to do stuff if image is
 # not existing and state != absent
 #
-state="present"
-[ -f "$__object/parameter/state" ] && state="$(cat "$__object/parameter/state")"
+state="$(cat "$__object/parameter/state")"
 [ "$state" = "absent" ] && exit 0
 
 exists="$(cat "$__object/explorer/exists")"
@@ -13,8 +12,7 @@ exists="$(cat "$__object/explorer/exists")"
 # Still there? Create image
 #
 
-format=qcow2
-[ -f "$__object/parameter/format" ] && format="$(cat "$__object/parameter/format")"
+format="$(cat "$__object/parameter/format")"
 size="$(cat "$__object/parameter/size")"
 diskimage="/$__object_id"
 
diff --git a/cdist/conf/type/__qemu_img/manifest b/cdist/conf/type/__qemu_img/manifest
index b835301d..6d50037f 100644
--- a/cdist/conf/type/__qemu_img/manifest
+++ b/cdist/conf/type/__qemu_img/manifest
@@ -2,10 +2,8 @@
 # Default settings
 #
 
-format=qcow2
-state=present
-[ -f "$__object/parameter/format" ] && format="$(cat "$__object/parameter/format")"
-[ -f "$__object/parameter/state" ] && state="$(cat "$__object/parameter/state")"
+format="$(cat "$__object/parameter/format")"
+state="$(cat "$__object/parameter/state")"
 
 diskimage="/$__object_id"
 
diff --git a/cdist/conf/type/__qemu_img/parameter/default/format b/cdist/conf/type/__qemu_img/parameter/default/format
new file mode 100644
index 00000000..e0a90ab9
--- /dev/null
+++ b/cdist/conf/type/__qemu_img/parameter/default/format
@@ -0,0 +1 @@
+qcow2
diff --git a/cdist/conf/type/__qemu_img/parameter/default/state b/cdist/conf/type/__qemu_img/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__qemu_img/parameter/default/state
@@ -0,0 +1 @@
+present
diff --git a/cdist/conf/type/__qemu_img/parameter/optional b/cdist/conf/type/__qemu_img/parameter/optional
index 0e8469e7..71b9a32b 100644
--- a/cdist/conf/type/__qemu_img/parameter/optional
+++ b/cdist/conf/type/__qemu_img/parameter/optional
@@ -1 +1,2 @@
 format
+state