Merge branch 'master' into block-devices

Author: markgoddard

README.md

@@ -113,6 +113,7 @@ Role Variables
           `libvirt_volume_default_format` are valid here. Default is
           `libvirt_volume_default_format`.
         - `image`: (optional) a URL to an image with which the volume is initalised (full copy).
+        - `checksum`: (optional) checksum of the `image` to avoid download when it's not necessary.
         - `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.
         - `target`: (optional) Manually influence type and order of volumes

defaults/main.yml

@@ -92,6 +92,10 @@ libvirt_vm_virsh_default_env: "{{  { 'LIBVIRT_DEFAULT_URI': libvirt_vm_uri } if
 # Override for the libvirt connection uri. Leave unset to use the default.
 libvirt_vm_uri: ""
 
+# Whether to use sudo with libvirt commands, this can be disabled with qemu:///session
+# to create VMs as an unprivileged user
+libvirt_vm_sudo: true
+
 # Default CPU mode if libvirt_vm_cpu_mode or vm.cpu_mode is undefined
 libvirt_cpu_mode_default: "{{ 'host-passthrough' if libvirt_vm_engine == 'kvm' else 'host-model' }}"
 

tasks/vm.yml

@@ -8,7 +8,7 @@
     recurse: true
     mode: 0770
   when: console_log_enabled | bool
-  become: true
+  become: "{{ libvirt_vm_sudo }}"
 
 - name: Validate VM interfaces
   include_tasks: check-interface.yml
@@ -22,12 +22,12 @@
     command: define
     xml: "{{ lookup('template', vm.xml_file | default('vm.xml.j2')) }}"
     uri: "{{ libvirt_vm_uri | default(omit, true) }}"
-  become: true
+  become: "{{ libvirt_vm_sudo }}"
 
 - name: Ensure the VM is running and started at boot
   virt:
     name: "{{ vm.name }}"
     autostart: "{{ autostart | bool }}"
     state: "{{ 'running' if (start | bool) else 'shutdown' }}"
     uri: "{{ libvirt_vm_uri | default(omit, true) }}"
-  become: true
+  become: "{{ libvirt_vm_sudo }}"

tasks/volumes.yml

@@ -1,17 +1,19 @@
 ---
 - name: Ensure remote images are downloaded
   get_url:
-    url: "{{ item }}"
-    dest: "{{ libvirt_vm_image_cache_path }}/{{ item | basename }}"
-  with_items: "{{ volumes | selectattr('image', 'defined') | map(attribute='image') | list }}"
-  when: "'http' in item"
+    url: "{{ item.image }}"
+    dest: "{{ libvirt_vm_image_cache_path }}/{{ item.image | basename }}"
+    checksum: "{{ item.checksum | default(omit) }}"
+  with_items: "{{ volumes | selectattr('image', 'defined') | list }}"
+  when: "'http' in item.image"
 
 - name: Ensure local images are copied
   copy:
-    src: "{{ item }}"
-    dest: "{{ libvirt_vm_image_cache_path }}/{{ item | basename }}"
+    src: "{{ item.image }}"
+    dest: "{{ libvirt_vm_image_cache_path }}/{{ item.image | basename }}"
+    checksum: "{{ item.checksum | default(omit) }}"
     remote_src: true
-  with_items: "{{ volumes | selectattr('image', 'defined') | map(attribute='image') | list }}"
+  with_items: "{{ volumes | selectattr('image', 'defined') | list }}"
   when: "'http' not in item"
 
 - name: Ensure the VM disk volumes exist