Merge pull request #41 from t2d/master

Run virt_volume.sh also in check mode

Author: markgoddard

files/virt_volume.sh

@@ -20,14 +20,15 @@
 # Parse options
 OPTIND=1
 
-while getopts ":n:p:c:f:i:b:" opt; do
+while getopts ":n:p:c:f:i:b:a:" opt; do
     case ${opt} in
         n) NAME=$OPTARG;;
         p) POOL=$OPTARG;;
         c) CAPACITY=$OPTARG;;
         f) FORMAT=$OPTARG;;
         i) IMAGE=$OPTARG;;
         b) BACKING_IMAGE=$OPTARG;;
+        a) CHECK=$OPTARG;;
         \?)
             echo "Invalid option: -$OPTARG" >&2
             exit 1
@@ -66,6 +67,12 @@ elif ! echo "$output" | grep 'Storage volume not found' >/dev/null 2>&1; then
     exit $result
 fi
 
+# Stop here in check mode, there will be a change
+if [[ $CHECK = "True" ]]; then
+    echo '{"changed": true}'
+    exit 0
+fi
+
 # Create the volume.
 if [[ -n $BACKING_IMAGE ]]; then
     if [[ "$FORMAT" != 'qcow2' ]]; then

tasks/volumes.yml

@@ -25,11 +25,13 @@
     {% elif item.backing_image is defined %}
     -b {{ item.backing_image }}
     {% endif %}
+    -a {{ ansible_check_mode }}
   with_items: "{{ volumes }}"
   when: item.device | default(libvirt_volume_default_device) == 'disk'
   environment: "{{ libvirt_vm_script_env }}"
   register: volume_result
   changed_when:
     - volume_result is success
     - (volume_result.stdout | from_json).changed | default(True)
+  check_mode: False
   become: true