Merge branch 'master' into 4.0-pre-not-stable

cdist/conf/type/__cdist/manifest

@@ -27,23 +27,11 @@ else
    shell=""
 fi
 
-if [ -f "$__object/parameter/username" ]; then
+username="$(cat "$__object/parameter/username")"
-   username="$(cat "$__object/parameter/username")"
-else
-   username="cdist"
-fi
 
-if [ -f "$__object/parameter/branch" ]; then
+branch="$(cat "$__object/parameter/branch")"
-   branch="$(cat "$__object/parameter/branch")"
-else
-   branch="master"
-fi
 
-if [ -f "$__object/parameter/source" ]; then
+source="$(cat "$__object/parameter/source")"
-   source="$(cat "$__object/parameter/source")"
-else
-   source="git://github.com/telmich/cdist.git"
-fi
 
 # Currently hardcoded - if anyone cares, make a parameter
 # out of it

cdist/conf/type/__cdist/parameter/default/branch

@@ -0,0 +1 @@
+master

cdist/conf/type/__cdist/parameter/default/source

@@ -0,0 +1 @@
+git://github.com/telmich/cdist.git

cdist/conf/type/__cdist/parameter/default/username

@@ -0,0 +1 @@
+cdist

cdist/conf/type/__key_value/gencode-remote

@@ -21,8 +21,8 @@
 
 key="$__object_id"
 [ -f "$__object/parameter/key" ] && key="$(cat "$__object/parameter/key")"
-state_should=present
+
-[ -f "$__object/parameter/state" ] && state_should="$(cat "$__object/parameter/state")"
+state_should="$(cat "$__object/parameter/state")"
 
 file="$(cat "$__object/parameter/file")"
 delimiter="$(cat "$__object/parameter/delimiter")"

cdist/conf/type/__key_value/manifest

@@ -19,8 +19,7 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-state_should=present
+state_should="$(cat "$__object/parameter/state")"
-[ -f "$__object/parameter/state" ] && state_should="$(cat "$__object/parameter/state")"
 
 if [ "$state_should" = "present" -a ! -f "$__object/parameter/value" ]; then
    echo "Missing required parameter 'value'" >&2

cdist/conf/type/__key_value/parameter/default/state

@@ -0,0 +1 @@
+present

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"
+state="$(cat "$__object/parameter/state")"
-[ -f "$__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
+format="$(cat "$__object/parameter/format")"
-[ -f "$__object/parameter/format" ] && format="$(cat "$__object/parameter/format")"
 size="$(cat "$__object/parameter/size")"
 diskimage="/$__object_id"
 

cdist/conf/type/__qemu_img/manifest

@@ -2,10 +2,8 @@
 # Default settings
 #
 
-format=qcow2
+format="$(cat "$__object/parameter/format")"
-state=present
+state="$(cat "$__object/parameter/state")"
-[ -f "$__object/parameter/format" ] && format="$(cat "$__object/parameter/format")"
-[ -f "$__object/parameter/state" ] && state="$(cat "$__object/parameter/state")"
 
 diskimage="/$__object_id"
 

cdist/conf/type/__qemu_img/parameter/default/format

@@ -0,0 +1 @@
+qcow2

cdist/conf/type/__qemu_img/parameter/default/state

@@ -0,0 +1 @@
+present

cdist/conf/type/__qemu_img/parameter/optional

@@ -1 +1,2 @@
 format
+state

cdist/conf/type/__zypper_repo/gencode-remote

@@ -45,11 +45,7 @@ else
    id="$__object_id"
 fi
 
-if [ -f "$__object/parameter/state" ]; then
+state="$(cat "$__object/parameter/state")"
-   state="$(cat "$__object/parameter/state")"
-else
-   state="present"
-fi
 
 repo_id="$(cat "$__object/explorer/repo_id")"
 

cdist/conf/type/__zypper_service/gencode-remote

@@ -39,17 +39,8 @@ else
    uri="$__object_id"
 fi
 
-if [ -f "$__object/parameter/state" ]; then
+state_should="$(cat "$__object/parameter/state")"
-   state_should="$(cat "$__object/parameter/state")"
+stype="$(cat "$__object/parameter/type")"
-else
-   state_should="present"
-fi
-
-if [ -f "$__object/parameter/type" ]; then
-   stype="$(cat "$__object/parameter/type")"
-else
-   stype="ris"
-fi
 
 exp_uri="$(cat "$__object/explorer/service_uri")"
 exp_id="$(cat "$__object/explorer/service_id")"

cdist/conf/type/__zypper_service/manifest

@@ -33,11 +33,7 @@ else
    uri="$__object_id"
 fi
 
-if [ -f "$__object/parameter/state" ]; then
+state_should="$(cat "$__object/parameter/state")"
-   state_should="$(cat "$__object/parameter/state")"
-else
-   state_should="present"
-fi
 
 exp_uri="$(cat "$__object/explorer/service_uri")"
 

docs/changelog

@@ -13,7 +13,12 @@ Changelog
 	* Core: Add environment variable to select shell for executing scripts (Daniel Heule)
 	* Explorer hostname: Return host name by using uname -n
 	* New Type: __hostname (Steven Armstrong)
+	* Type __cdist: Use default paremeters (Daniel Heule)
+	* Type __key_value: Use default paremeters (Daniel Heule)
 	* Type __line: Use printf instead of echo for printing user input
+	* Type __qemu_img: Use default paremeters (Daniel Heule)
+	* Type __zypper_repo: Use default paremeters (Daniel Heule)
+	* Type __zypper_service: Use default paremeters (Daniel Heule)
 
 3.0.2: 2014-01-19
 	* Documentation: Document all messages sent by types (Daniel Heule)