Merge pull request #19 from JPvRiel/master

Support backing image and destroy VMs before volumes

Author: markgoddard

README.md

@@ -53,14 +53,16 @@ Role Variables
 
     - `volumes`: a list of volumes to attach to the VM.  Each volume is
       defined with the following dict:
+        - `pool`: Name or UUID of the storage pool from which the volume should be
+          allocated.
         - `name`: Name to associate with the volume being created.
+        - `capacity`: volume capacity (can be suffixed with M,G,T or MB,GB,TB, etc)
         - `device`: `disk`
         - `format`: options include `raw`, `qcow2`, `vmdk`.  See `man virsh` for the
           full range.  Default is `qcow2`
-        - `capacity`: volume capacity (can be suffixed with M,G,T or MB,GB,TB, etc)
-        - `image`: (optional) a URL to an image with which the volume is initalised.
-        - `pool`: Name or UUID of the storage pool from which the volume should be
-          allocated.
+        - `image`: (optional) a URL to an image with which the volume is initalised (full copy).
+        - `backing_image`: (optional) name of the backing volume which is assumed to already be the same pool (copy-on-write).
+        - `image` and `backing_image` are mutually exclusive options.
 
     - `interfaces`: a list of network interfaces to attach to the VM.
       Each network interface is defined with the following dict:

files/virt_volume.sh

@@ -17,82 +17,121 @@
 # Ensure that a libvirt volume exists, optionally uploading an image.
 # On success, output a JSON object with a 'changed' item.
 
-if [[ $# -ne 4 ]] && [[ $# -ne 5 ]]; then
-    echo "Usage: $0 <name> <pool> <capacity> <format> [<image>]"
+# Parse options
+OPTIND=1
+
+while getopts ":n:p:c:f:i:b:" opt; do
+    case ${opt} in
+        n) NAME=$OPTARG;;
+        p) POOL=$OPTARG;;
+        c) CAPACITY=$OPTARG;;
+        f) FORMAT=$OPTARG;;
+        i) IMAGE=$OPTARG;;
+        b) BACKING_IMAGE=$OPTARG;;
+        \?)
+            echo "Invalid option: -$OPTARG" >&2
+            exit 1
+            ;;
+        :)
+            echo "Option -$OPTARG requires an argument." >&2
+            exit 1
+            ;;
+    esac
+done
+
+# Check options
+if ! [[ -n $NAME && -n $POOL && -n $CAPACITY ]]; then
+    echo "Missing manditory options"  >&2
+    echo "Usage: $0 -n <name> -p <pool> -c <capacity> [-f <format>] [-i <source image> | -b <backing image>]"
     exit 1
 fi
+if [[ -n $IMAGE && -n $BACKING_IMAGE ]]; then
+  echo "Options -i and -b are mutually exclusive" >&2
+  exit 1
+fi
+if [[ -z "$FORMAT" ]]; then
+    FORMAT='qcow2'
+fi
 
-NAME=$1
-POOL=$2
-CAPACITY=$3
-FORMAT=$4
-IMAGE=$5
 
 # Check whether a volume with this name exists.
-output=$(virsh vol-info --pool $POOL --vol $NAME 2>&1)
+output=$(virsh vol-info --pool "$POOL" --vol "$NAME" 2>&1)
 result=$?
 if [[ $result -eq 0 ]]; then
     echo '{"changed": false}'
     exit 0
 elif ! echo "$output" | grep 'Storage volume not found' >/dev/null 2>&1; then
-    echo "Unexpected error while getting volume info"
+    echo "Unexpected error while getting volume info" >&2
     echo "$output"
     exit $result
 fi
 
 # Create the volume.
-output=$(virsh vol-create-as --pool $POOL --name $NAME --capacity $CAPACITY --format $FORMAT 2>&1)
-result=$?
+if [[ -n $BACKING_IMAGE ]]; then
+    if [[ "$FORMAT" != 'qcow2' ]]; then
+        echo "qcow2 format assumed for backing images, but $FORMAT format was supplied."
+        exit 1
+    fi
+    output=$(virsh vol-create-as --pool "$POOL" --name "$NAME" --capacity "$CAPACITY" --format "$FORMAT" --backing-vol "$BACKING_IMAGE" --backing-vol-format "$FORMAT" 2>&1)
+    result=$?
+else
+    output=$(virsh vol-create-as --pool "$POOL" --name "$NAME" --capacity "$CAPACITY" --format "$FORMAT" 2>&1)
+    result=$?
+fi
 if [[ $result -ne 0 ]]; then
     echo "Failed to create volume"
     echo "$output"
     exit $result
 fi
 
 # Determine the path to the volume file.
-output=$(virsh vol-key --pool $POOL --vol $NAME 2>&1)
+output=$(virsh vol-key --pool "$POOL" --vol "$NAME" 2>&1)
 result=$?
 if [[ $result -ne 0 ]]; then
     echo "Failed to get volume file path"
     echo "$output"
-    virsh vol-delete --pool $POOL --vol $NAME
+    virsh vol-delete --pool "$POOL" --vol "$NAME"
     exit $result
 fi
 
 # Change the ownership of the volume to VOLUME_OWNER:VOLUME_GROUP if
 # these environmental variables are defined. Without doing this libvirt
 # cannot access the volume on RedHat based GNU/Linux distributions.
-existing_owner="$(stat --format '%U' "$output")"
-existing_group="$(stat --format '%G' "$output")"
-new_owner="${VOLUME_OWNER:-$existing_owner}"
-new_group="${VOLUME_GROUP:-$existing_group}"
-output=$(chown "$new_owner":"$new_group" $output 2>1)
-result=$?
-if [[ $result -ne 0 ]]; then
-    echo "Failed to change ownership of the volume to $new_owner:$new_group"
-    echo "$output"
-    virsh vol-delete --pool $POOL --vol $NAME
-    exit $result
+# Avoid attempting to change permissions on volumes that are not file or
+# directory based
+if [[ -f "$output" || -d "$output" ]]; then
+    existing_owner="$(stat --format '%U' "$output")"
+    existing_group="$(stat --format '%G' "$output")"
+    new_owner="${VOLUME_OWNER:-$existing_owner}"
+    new_group="${VOLUME_GROUP:-$existing_group}"
+    output=$(chown "$new_owner":"$new_group" "$output" 2>1)
+    result=$?
+    if [[ $result -ne 0 ]]; then
+        echo "Failed to change ownership of the volume to $new_owner:$new_group"
+        echo "$output"
+        virsh vol-delete --pool "$POOL" --vol "$NAME"
+        exit $result
+    fi
 fi
 
 if [[ -n $IMAGE ]]; then
     # Upload an image to the volume.
-    output=$(virsh vol-upload --pool $POOL --vol $NAME --file $IMAGE 2>&1)
+    output=$(virsh vol-upload --pool "$POOL" --vol "$NAME" --file "$IMAGE" 2>&1)
     result=$?
     if [[ $result -ne 0 ]]; then
         echo "Failed to upload image $IMAGE to volume $NAME"
         echo "$output"
-        virsh vol-delete --pool $POOL --vol $NAME
+        virsh vol-delete --pool "$POOL" --vol "$NAME"
         exit $result
     fi
 
     # Resize the volume to the requested capacity.
-    output=$(virsh vol-resize --pool $POOL --vol $NAME --capacity $CAPACITY 2>&1)
+    output=$(virsh vol-resize --pool "$POOL" --vol "$NAME" --capacity "$CAPACITY" 2>&1)
     result=$?
     if [[ $result -ne 0 ]]; then
         echo "Failed to resize volume $VOLUME to $CAPACITY"
         echo "$output"
-        virsh vol-delete --pool $POOL --vol $NAME
+        virsh vol-delete --pool "$POOL" --vol "$NAME"
         exit $result
     fi
 fi

tasks/main.yml

@@ -42,16 +42,16 @@
     loop_var: vm
   when: (vm.state | default('present', true)) == 'present'
 
-- include_tasks: destroy-volumes.yml
-  vars:
-    volumes: "{{ vm.volumes | default([], true) }}"
+- include_tasks: destroy-vm.yml
   with_items: "{{ libvirt_vms }}"
   loop_control:
     loop_var: vm
   when: (vm.state | default('present', true)) == 'absent'
 
-- include_tasks: destroy-vm.yml
+- include_tasks: destroy-volumes.yml
+  vars:
+    volumes: "{{ vm.volumes | default([], true) }}"
   with_items: "{{ libvirt_vms }}"
   loop_control:
     loop_var: vm
-  when: (vm.state | default('present', true)) == 'absent'
+  when: (vm.state | default('present', true)) == 'absent'

tasks/volumes.yml

@@ -16,12 +16,14 @@
 - name: Ensure the VM volumes exist
   script: >
     virt_volume.sh
-    {{ item.name }}
-    {{ item.pool }}
-    {{ item.capacity }}
-    {{ item.format | default(libvirt_volume_default_format) }}
+    -n {{ item.name }}
+    -p {{ item.pool }}
+    -c {{ item.capacity }}
+    -f {{ item.format | default(libvirt_volume_default_format) }}
     {% if item.image is defined %}
-    {{ libvirt_vm_image_cache_path }}/{{ item.image | basename }}
+    -i {{ libvirt_vm_image_cache_path }}/{{ item.image | basename }}
+    {% elif item.backing_image is defined %}
+    -b {{ item.backing_image }}
     {% endif %}
   with_items: "{{ volumes }}"
   environment: "{{ libvirt_vm_script_env }}"