Merge pull request #70 from stackhpc/block-devices

Support passthrough block devices

Author: markgoddard

README.md

@@ -27,7 +27,8 @@ Role Variables
   stored. Default is '/var/lib/libvirt/images'.
 
 - `libvirt_volume_default_type`: What type of backing volume does the instance
-  use? Default is `volume`. Options include `file`, `network` and `volume`.
+  use? Default is `volume`. Options include `block`, `file`, `network` and
+  `volume`.
 
 - `libvirt_volume_default_format`: Format for volumes created by the role.
   Default is `qcow2`. Options include `raw`, `qcow2`, `vmdk`.  See `man virsh`
@@ -116,6 +117,7 @@ Role Variables
         - `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
+        - `dev`: (optional) Block device path when type is `block`.
 
     - `interfaces`: a list of network interfaces to attach to the VM.
       Each network interface is defined with the following dict:
@@ -219,6 +221,9 @@ Example Playbook
                       - 'mon1.example.org'
                       - 'mon2.example.org'
                       - 'mon3.example.org'
+                - type: 'block'
+                  format: 'raw'
+                  dev: '/dev/sda'
 
               interfaces:
                 - network: 'br-datacentre'

tasks/volumes.yml

@@ -12,6 +12,7 @@
     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') | list }}"
   when: "'http' not in item.image"
 

templates/vm.xml.j2

@@ -40,19 +40,21 @@
       <driver name='qemu' type='{{ volume.format | default(libvirt_volume_default_format) }}'/>
       {% if volume.type | default(libvirt_volume_default_type) == 'file' %}
       <source file='{{ volume.file_path |default(libvirt_volume_default_images_path) }}/{{ volume.name}}'/>
-      {% elif volume.type is defined and volume.type == 'network' %}
+      {% elif volume.type | default(libvirt_volume_default_type) == 'network' %}
         {% if volume.auth.username is defined %}
-        <auth username='{{ volume.auth.username }}'>
-          <secret type='{{ volume.auth.type }}' {% if volume.auth.uuid is defined and volume.auth.uuid is not none %} uuid='{{ volume.auth.uuid }}' {% else %} usage='{{ volume.auth.usage }}' {% endif %}/>
-        </auth>
+      <auth username='{{ volume.auth.username }}'>
+        <secret type='{{ volume.auth.type }}' {% if volume.auth.uuid is defined and volume.auth.uuid is not none %} uuid='{{ volume.auth.uuid }}' {% else %} usage='{{ volume.auth.usage }}' {% endif %}/>
+      </auth>
         {% endif %} {# End volume.auth.username check #}
         {% if volume.source.name is defined %}
-        <source protocol='{{ volume.source.protocol }}' name='{{ volume.source.name }}'>
+      <source protocol='{{ volume.source.protocol }}' name='{{ volume.source.name }}'>
           {% for host in volume.source.hosts_list %}
-          <host name='{{ host }}' {% if volume.source.port is defined and volume.source.port is not none %} port='{{ volume.source.port }}' {% endif %}/>
+        <host name='{{ host }}' {% if volume.source.port is defined and volume.source.port is not none %} port='{{ volume.source.port }}' {% endif %}/>
           {% endfor %}
-        </source>
+      </source>
         {% endif %} {# End volume.source.name check #}
+      {% elif volume.type | default(libvirt_volume_default_type) == 'block' %}
+      <source dev='{{ volume.dev }}'/>
       {% else %} {# End elif volume.type is defined #}
       <source pool='{{ volume.pool }}' volume='{{ volume.name }}'/>
       {% endif %}